样品订单出库账户是为空的判断从保存方法中转移至提交验证中

src/apps/saorder/saorder.java

@@ -169,19 +169,6 @@ public class saorder extends BaseSaorder {
                 }
             }
             PaoSetRemote saorderdetail_view = getPaoSet("saorderdetail_view");
-            if ("样品".equals(getString("ftypemx"))) {
-                int i = 0;
-                PaoRemote detailpao = null;
-                while ((detailpao = saorderdetail_view.getPao(i)) != null) {
-                    if (!detailpao.toBeDeleted() && !detailpao.toBeAdded()) {
-                        if ("".equals(saorderdetail_view.getPao(i).getString("warehouse"))) {
-                            throw new P2AppException("", "样品订单需指定商品出库仓库");
-                        }
-                    }
-                    i++;
-                }
-            }
-
             if ("".equals(getString("fpayagentnum"))) {
                 setValue("fpayagentnum", getString("fagentnum"), 11L);
             }
@@ -721,6 +708,11 @@ public class saorder extends BaseSaorder {
                         throw new P2AppException("", "商品" + saorderdetail.getPao(i).getString("fitemname") + "交期管控，请填写交期");
                     }
                 }
+                if("样品".equals(getString("ftypemx"))){
+                    if ("".equals(saorderdetail.getPao(i).getString("warehouse"))) {
+                        throw new P2AppException("", "样品订单需指定商品出库仓库");
+                    }
+                }
                 i++;
             }
 
@@ -1062,7 +1054,7 @@ public class saorder extends BaseSaorder {
                 sendEmail(getMailByHrGroup(getString("siteid") + "1005"), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》提交，需要进行交期回复", getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》提交待交期回复；订单号：" + getString("fsonum"));
             }
             //销管订单提交待审核邮件提醒
-            sendEmail(getMailByHrGroup(getString("siteid") + "1001"), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》提交待审", "【订单领域】"+getString("fieldname")+",【订单提交待审核】订单号：" + getString("fsonum") + "（订单客户：" + getString("FAGENTSHORTNAME") + "，备注：" + ("".equals(getString("fnotes")) ? "无" : getString("fnotes")) + "）已提交请审核；");
+            sendEmail(getMailByHrGroup(getString("siteid") + "1001"), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》提交待审", "【订单领域】" + getString("fieldname") + ",【订单提交待审核】订单号：" + getString("fsonum") + "（订单客户：" + getString("FAGENTSHORTNAME") + "，备注：" + ("".equals(getString("fnotes")) ? "无" : getString("fnotes")) + "）已提交请审核；");
             //任务箱提醒
             createAssignment(getHrIdByHrGroup(getString("siteid") + "1001"), "SAORDER0", getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》提交待审", getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》提交待审；订单号：" + getString("fsonum"));
         } else {