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 fb1ef048..2df0225a 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
@@ -88,8 +88,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
         if ("yem_es_materialinfo".equals(entryProp.toString())) {
             for (int row : rowIndexs) {
                 boolean flag = true;
-                DynamicObject[] encasement = BusinessDataServiceHelper.load("yem_im_encasement", "" +
-                        "yem_im_materialinfo_mi.yem_sourceentryid,yem_im_materialinfo_mi.yem_packingqty", new QFilter[]{
+                DynamicObject[] encasement = BusinessDataServiceHelper.load("yem_im_encasement", "yem_im_materialinfo_mi.yem_sourceentryid,yem_im_materialinfo_mi.yem_packingqty", new QFilter[]{
                         new QFilter("yem_sourcebillid", QCP.equals, dataEntity.getPkValue())
                 });
                 if (materialinfo != null && materialinfo.size() > row) {
@@ -220,6 +219,39 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
         }
     }
 
+    /**
+     * 计算台数
+     */
+    private void qty() {
+        DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo");
+        if (yemEsMaterialinfo.size()>0){
+            Map<Long ,BigDecimal> map = new HashMap<>();
+            for (DynamicObject loadSingle : yemEsMaterialinfo) {
+                long aLong = loadSingle.getLong("yem_productmodel.id");
+                BigDecimal yemQty = loadSingle.getBigDecimal("yem_qty");
+                if (map.get(aLong).compareTo(BigDecimal.ZERO)==0){
+                    map.put(aLong,yemQty);
+                }else {
+                    BigDecimal bigDecimal = map.get(aLong);
+                    map.put(aLong,bigDecimal.add(yemQty));
+                }
+            }
+            DynamicObjectCollection yemEsSalesorderL = this.getModel().getEntryEntity("yem_es_salesorder_l");
+            if (yemEsSalesorderL!=null){
+                for (DynamicObject loadSingle : yemEsSalesorderL) {
+                    DynamicObject yemGiftproactype = loadSingle.getDynamicObject("yem_giftproactype");
+                    if (yemGiftproactype!=null) {
+                        long aLong = yemGiftproactype.getLong("id");
+                        if (map.get(aLong).compareTo(BigDecimal.ZERO)!=0) {
+                            loadSingle.set("yem_tsagerqty",map.get(aLong) );
+                        }
+                    }
+                }
+            }
+
+        }
+    }
+
     private void customclass(ChangeData changeData) {
         Object newValue = changeData.getNewValue();
         int rowIndex = changeData.getRowIndex();
@@ -229,12 +261,8 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
                 String yemUnit = yem_customclass.getString("yem_unit");
                 DynamicObject bdMeasureunits = BusinessDataServiceHelper.loadSingle("bd_measureunits", "id,number,name"
                         , new QFilter[]{new QFilter("name", QCP.equals, yemUnit)});
-                if (bdMeasureunits != null) {
-//                    long aLong = bdMeasureunits.getLong("id");
-                    this.getModel().setValue("yem_declareunit",bdMeasureunits,rowIndex);
-                }else {
-                    this.getModel().setValue("yem_declareunit",null,rowIndex);
-                }
+                //                    long aLong = bdMeasureunits.getLong("id");
+                this.getModel().setValue("yem_declareunit", bdMeasureunits,rowIndex);
             }else {
                 this.getModel().setValue("yem_declareunit",null,rowIndex);
             }
@@ -530,7 +558,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
                             model.setValue("yem_giftproactype", productType, entryRow);//产品机型
 
                             model.setValue("yem_bd_products", productss, entryRow);//产品分类
-                            model.setValue("yem_tsagerqty", tsagerQty, entryRow);//台数
+//                            model.setValue("yem_tsagerqty", tsagerQty, entryRow);//台数
                             model.setValue("yem_singlegiftamt", giveAmo, entryRow);//单台礼品金额
                             model.setValue("yem_singlegiftamtloc", giveAmoBase, entryRow);//单台礼品金额本位币
                             model.setValue("yem_giftamt", tsagerQty.multiply(giveAmo), entryRow);//礼品金额
@@ -576,7 +604,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
                                 model.setValue("yem_giftproactype", productType, entryRow);//产品机型
 
                                 model.setValue("yem_bd_products", productss, entryRow);//产品分类
-                                model.setValue("yem_tsagerqty", tsagerQty, entryRow);//台数
+//                                model.setValue("yem_tsagerqty", tsagerQty, entryRow);//台数
                                 model.setValue("yem_singlegiftamt", giveAmo, entryRow);//单台礼品金额
                                 model.setValue("yem_singlegiftamtloc", giveAmoBase, entryRow);//单台礼品金额本位币
                                 model.setValue("yem_giftamt", tsagerQty.multiply(giveAmo), entryRow);//礼品金额
@@ -588,6 +616,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
                 }
             }
         }
+        qty();
     }
 
     public void visGiftGive() {
@@ -602,11 +631,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
                 break;
             }
         }
-        if (flag) {
-            view.setVisible(true, "yem_tabpageap6");
-        } else {
-            view.setVisible(false, "yem_tabpageap6");
-        }
+        view.setVisible(flag, "yem_tabpageap6");
 
     }