fix:

2.订舱通知单物流订舱完成按钮效验

src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java

@@ -102,30 +102,49 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
 //            }
 //            SaveServiceHelper.save(new DynamicObject[]{this.getModel().getDataEntity(true)});
             SaveServiceHelper.update(this.getModel().getDataEntity(true));
+            extracted();
+        }
+        IDataModel model = this.getModel();
+        IFormView view = this.getView();
+        DynamicObject dataEntity = model.getDataEntity(true);
+        if ("custom_save".equals(operateKey)) {
+            SaveServiceHelper.save(new DynamicObject[]{dataEntity});
+            view.invokeOperation("refresh");
+        }
+        if ("cancel_finish_status".equals(operateKey)) {
+            dataEntity.set("yem_bookingspacestatus", "A");
+            SaveServiceHelper.save(new DynamicObject[]{dataEntity});
+            view.invokeOperation("refresh");
+        }
+    }
+
+    private void extracted() {
         boolean boonle = true;
         int i = 1;
         String string = "";
-            Date yemInitforecdate = (Date) this.getModel().getValue("yem_initforecdate");
         DynamicObject yemTransportstyle = (DynamicObject) this.getModel().getValue("yem_transportstyle");//运输方式
         String yemNoticeno = (String) this.getModel().getValue("yem_noticeno");//主题单号
-            String yemHousebillofladnum = (String) this.getModel().getValue("yem_housebillofladnum");//分提单号
+//            String yemHousebillofladnum = (String) this.getModel().getValue("yem_housebillofladnum");//分提单号
+        Date yemInitforecdate = (Date) this.getModel().getValue("yem_initforecdate");//预计船期/班列
         String yemShipname = (String) this.getModel().getValue("yem_shipname");//船名
         String yemVoyageno = (String) this.getModel().getValue("yem_voyageno");//航次
         Date yemCutdate = (Date) this.getModel().getValue("yem_cutdate");//截单日期
         Date yemPortinterception = (Date) this.getModel().getValue("yem_portinterception");//截港日期
-//            DynamicObject yemCfscompnay = (DynamicObject) this.getModel().getValue("yem_cfscompnay");//货代公司
         String yemCfscompnay = (String) this.getModel().getValue("yem_cfscompnaytxt");//货代公司
         Date yemEtddate = (Date) this.getModel().getValue("yem_etddate");//ETD(离港日期）
         DynamicObject yemSctcompnayname = (DynamicObject) this.getModel().getValue("yem_sctcompnayname");//船公司
         String yemStation = (String) this.getModel().getValue("yem_stationtext");//场站
-            List<Map<String, Object>> atts = AttachmentServiceHelper.getAttachments("yem_es_storagetrans_wl",
+        Object yemAttachmentcountqty = this.getModel().getValue("yem_attachmentcountqty");//物流附件
-                    this.getModel().getValue("id"), "yem_attachmentpanel");
         if (yemTransportstyle != null) {
             String number = yemTransportstyle.getString("number");
-                if ("YSFS-0004".equals(number) || "YSFS-0006".equals(number) || "YSFS-0008".equals(number) ||
+            if ("YSFS002_SYS".equals(number)) {
-                        "YSFS-0010".equals(number) || "YSFS-1003".equals(number) || "YSFS-1004".equals(number)) {
+                if ("".equals(yemNoticeno)) {
-                    if ("".equals(yemNoticeno) && "".equals(yemHousebillofladnum)) {
+                    string = string + i + ". 主提单号为空，请稍后重试！\n";
-                        string = string + i + ". 主,分提单号为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemAttachmentcountqty != null) {
+                    string = string + i + ". 物流附件面板为空，请稍后重试！\n";
                     boonle = false;
                     i++;
                 }
@@ -134,8 +153,27 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                     boonle = false;
                     i++;
                 }
-                    if (atts.isEmpty()) {
+                if (YEM.isEmpty(yemCfscompnay)) {
-                        string = string + i + ". 物流附件面板为空，请稍后重试！\n";
+                    string = string + i + ". 货代公司为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemEtddate == null) {
+                    string = string + i + ". ETD(离港日期）为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+            }
+            if ("YSFS-0004".equals(number) || "YSFS-0006".equals(number) || "YSFS-0010".equals(number) || "YSFS-0008".equals(number) || "YSFS-1008".equals(number)
+                    || "YSFS-1004".equals(number) || "YSFS-1005".equals(number) || "YSFS-1006".equals(number)) {
+
+                if ("".equals(yemNoticeno)) {
+                    string = string + i + ". 主提单号为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemInitforecdate == null) {
+                    string = string + i + ". 预计船期/班列为空，请稍后重试！\n";
                     boonle = false;
                     i++;
                 }
@@ -165,7 +203,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                     i++;
                 }
                 if (yemEtddate == null) {
-                        string = string + i + ". ETD(离港日期）为空，请稍后重试！\n";
+                    string = string + i + ". 起运地ETD(离港日期）为空，请稍后重试！\n";
                     boonle = false;
                     i++;
                 }
@@ -179,14 +217,19 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                     boonle = false;
                     i++;
                 }
+                if (yemAttachmentcountqty != null) {
+                    string = string + i + ". 物流附件面板为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
                 }
-                if ("YSFS-0005".equals(number) || "YSFS-0011".equals(number)) {
+            }
+            if ("YSFS-0011".equals(number) || "YSFS-1010".equals(number) || "YSFS-1002".equals(number) || "YSFS-1007".equals(number) || "YSFS-1011".equals(number) || "YSFS-1012".equals(number)) {
                 if (yemEtddate == null) {
                     string = string + i + ". ETD(离港日期）为空，请稍后重试！\n";
                     boonle = false;
                     i++;
                 }
-                    if (atts.isEmpty()) {
+                if (yemAttachmentcountqty != null) {
                     string = string + i + ". 物流附件面板为空，请稍后重试！\n";
                     boonle = false;
                     i++;
@@ -202,89 +245,13 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                     i++;
                 }
             }
-                if ("YSFS-1001".equals(number) || "YSFS-1002".equals(number)) {
-                    if (YEM.isEmpty(yemCfscompnay)) {
-                        string = string + i + ". 货代公司为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (yemInitforecdate == null) {
-                        string = string + i + ". 预计船期为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                }
-                if ("YSFS-1002".equals(number)) {
-                    if (atts.isEmpty()) {
-                        string = string + i + ". 物流附件面板为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                }
-                if ("YSFS-0007".equals(number)) {
-                    if ("".equals(yemNoticeno) && "".equals(yemHousebillofladnum)) {
-                        string = string + i + ". 主,分提单号为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (atts.isEmpty()) {
-                        string = string + i + ". 物流附件面板为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (yemInitforecdate == null) {
-                        string = string + i + ". 预计船期为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if ("".equals(yemShipname)) {
-                        string = string + i + ". 船名为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if ("".equals(yemVoyageno)) {
-                        string = string + i + ". 航次为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (yemCutdate == null) {
-                        string = string + i + ". 截单日期为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (yemPortinterception == null) {
-                        string = string + i + ". 截港日期为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (YEM.isEmpty(yemCfscompnay)) {
-                        string = string + i + ". 货代公司为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (yemEtddate == null) {
-                        string = string + i + ". ETD(离港日期）为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (yemSctcompnayname == null) {
-                        string = string + i + ". 船公司为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                    if (yemStation == null) {
-                        string = string + i + ". 场站为空，请稍后重试！\n";
-                        boonle = false;
-                        i++;
-                    }
-                }
             if ("YSFS002_SYS".equals(number)) {
-                    if ("".equals(yemNoticeno) && "".equals(yemHousebillofladnum)) {
+                if ("".equals(yemNoticeno)) {
-                        string = string + i + ". 主,分提单号为空，请稍后重试！\n";
+                    string = string + i + ". 主提单号为空，请稍后重试！\n";
                     boonle = false;
                     i++;
                 }
-                    if (atts.isEmpty()) {
+                if (yemAttachmentcountqty != null) {
                     string = string + i + ". 物流附件面板为空，请稍后重试！\n";
                     boonle = false;
                     i++;
@@ -294,16 +261,16 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                     boonle = false;
                     i++;
                 }
-//                    if (yemCutdate == null) {
+                if (yemCutdate == null) {
-//                        string = string + i + ". 截单日期为空，请稍后重试！\n";
+                    string = string + i + ". 截单日期为空，请稍后重试！\n";
-//                        boonle = false;
+                    boonle = false;
-//                        i++;
+                    i++;
-//                    }
+                }
-//                    if (yemPortinterception == null) {
+                if (yemPortinterception == null) {
-//                        string = string + i + ". 截港日期为空，请稍后重试！\n";
+                    string = string + i + ". 截港日期为空，请稍后重试！\n";
-//                        boonle = false;
+                    boonle = false;
-//                        i++;
+                    i++;
-//                    }
+                }
                 if (YEM.isEmpty(yemCfscompnay)) {
                     string = string + i + ". 货代公司为空，请稍后重试！\n";
                     boonle = false;
@@ -315,6 +282,55 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                     i++;
                 }
             }
+            if ("YSFS-1013".equals(number) || "YSFS-0005".equals(number)) {
+                if (yemInitforecdate == null) {
+                    string = string + i + ". 预计船期为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemAttachmentcountqty != null) {
+                    string = string + i + ". 物流附件面板为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemCutdate == null) {
+                    string = string + i + ". 截单日期为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemPortinterception == null) {
+                    string = string + i + ". 截港日期为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (YEM.isEmpty(yemCfscompnay)) {
+                    string = string + i + ". 货代公司为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemEtddate == null) {
+                    string = string + i + ". ETD(离港日期）为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemStation == null) {
+                    string = string + i + ". 场站为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+            }
+            if ("YSFS-1001".equals(number)) {
+                if (YEM.isEmpty(yemCfscompnay)) {
+                    string = string + i + ". 货代公司为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+                if (yemInitforecdate == null) {
+                    string = string + i + ". 预计船期为空，请稍后重试！\n";
+                    boonle = false;
+                    i++;
+                }
+            }
         }
         if (boonle) {
             this.getModel().setValue("yem_bookingspacestatus", "B");
@@ -327,19 +343,6 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
             this.getView().showErrorNotification(string);
         }
     }
-        IDataModel model = this.getModel();
-        IFormView view = this.getView();
-        DynamicObject dataEntity = model.getDataEntity(true);
-        if ("custom_save".equals(operateKey)) {
-            SaveServiceHelper.save(new DynamicObject[]{dataEntity});
-            view.invokeOperation("refresh");
-        }
-        if ("cancel_finish_status".equals(operateKey)) {
-            dataEntity.set("yem_bookingspacestatus", "A");
-            SaveServiceHelper.save(new DynamicObject[]{dataEntity});
-            view.invokeOperation("refresh");
-        }
-    }
 
     @Override
     public void closedCallBack(ClosedCallBackEvent e) {
@@ -453,10 +456,11 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
         }
     }
 
-    public void uptddate(String yem_billno, Map<String, Object> map) {
     /**
      * 订舱通知书
      */
+    public void uptddate(String yem_billno, Map<String, Object> map) {
+
         DynamicObject yem_es_storagetrans = BusinessDataServiceHelper.loadSingle("yem_es_storagetrans", "id",
                 new QFilter[]{new QFilter("billno", QCP.equals, yem_billno)});
         if (yem_es_storagetrans != null) {
@@ -510,6 +514,21 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
         if ("yem_transportstyle".equals(name)) {
             DynamicObject newValue = (DynamicObject) e.getChangeSet()[0].getNewValue();
             String number = newValue.getString("number");
+            sportp(number);
+        }
+    }
+
+    @Override
+    public void afterBindData(EventObject e) {
+        super.afterBindData(e);
+        Object yemTransportstyle = this.getModel().getValue("yem_transportstyle");
+        if (yemTransportstyle!=null) {
+            String number = ((DynamicObject) yemTransportstyle).getString("number");
+            sportp(number);
+        }
+    }
+
+    private void sportp(String number) {
         if ("YSFS-0004".equals(number) || "YSFS-0006".equals(number) || "YSFS-0010".equals(number) || "YSFS-0008".equals(number) || "YSFS-1008".equals(number)
                 || "YSFS-1004".equals(number) || "YSFS-1005".equals(number) || "YSFS-1006".equals(number)) {
             TextEdit yem_noticeno = this.getControl("yem_noticeno");//主提单号
@@ -584,7 +603,8 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
             yem_sctcompnayname.setMustInput(false);
             TextEdit yem_stationtext = this.getControl("yem_stationtext");//场站
             yem_stationtext.setMustInput(false);
-            }if ("YSFS-1013".equals(number)||"YSFS-0005".equals(number)){
+        }
+        if ("YSFS-1013".equals(number) || "YSFS-0005".equals(number)) {
             DateEdit yem_initforecdate = this.getControl("yem_initforecdate");//预计船期/班列
             yem_initforecdate.setMustInput(true);
             DateEdit yem_cutdate = this.getControl("yem_cutdate");//截单日期
@@ -636,4 +656,3 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
         }
     }
 }
-}