Merge remote-tracking branch 'Gogs/develop' into develop

src/apps/ficashbill/ficashbill.java

@@ -352,7 +352,7 @@ public class ficashbill extends PaoCust {
 
         if ((isincom && "收入".equals(getString("ftype"))) || (!isincom && "支出".equals(getString("ftype")))) {
         	if(famount > 0){
-        	    sendEmail(getMailBySalesGroup(getString("fagentnum")), "经销商有新的收入到账", "经销商有新的收入凭证,收入金额:"+famount);
+        		sendEmail(getMailBySalesGroup(getString("fagentnum"),getString("siteid")), "经销商有新的收入到账", "经销商有新的收入凭证,收入金额:"+famount);
         	}
             setValue("ftaccbalbalance", taccbal.getDouble("fbalance"), 11L);
             setValue("fstatus", "审核", 11L);

src/apps/ficashbill/ficashbillAppBean.java

@@ -36,7 +36,7 @@ public class ficashbillAppBean extends AppBeanCust {
                 	String hrid =getPao().getUserName();
                 	String salenum = ((PaoCust) getPao()).getSalenumByHrid(getPao().getUserName());
                 	if("RECBILL".equalsIgnoreCase(appname) && salenum!=null && salenum.equals("ÏúÊÛÖúÀí")){
-                	    databean.setAppWhere("fagentnum in (select fagentnum from tagents where siteid='HY' and fsalenum='"+hrid+"') and fstatus='ÉóºË'");
+                	    databean.setAppWhere("fagentnum in (select tagentsales.fagentnum from tagentsales  where  fsalenum='"+hrid+"') and fstatus='ÉóºË' and ftype = 'ÊÕÈë'");
                 	}
                     if ("RECBILL2".equalsIgnoreCase(appname)) {
                         if (agentnum != null) {

src/apps/saorder/saorder.java

@@ -1062,7 +1062,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("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 {

src/apps/tagentsales/tagentsales.java

@@ -0,0 +1,52 @@
+package tagentsales;
+
+import baseclass.PaoCust;
+import baseclass.tools.GetFieldsName;
+import p2.pao.PaoRemote;
+import p2.pao.PaoSet;
+import p2.pao.PaoSetRemote;
+import p2.util.P2AppException;
+import p2.util.P2Exception;
+import tagents.tagents;
+
+public class tagentsales  extends PaoCust{
+
+	public tagentsales(PaoSet arg0) {
+		super(arg0);
+		// TODO Auto-generated constructor stub
+	}
+	
+	@Override
+	  public void add() throws P2Exception {
+	      super.add();
+	      if(getOwner()!=null) {
+	          setValue("fagentnum", getOwner().getString("fagentnum"));
+	      }
+
+	  }
+
+	  @Override
+	  public void init() throws P2Exception {
+	      super.init();
+	if (!toBeAdded()  && getOwner() instanceof tagents
+	      && !"新建".equals(getOwner().getString("fstatus")) && getOwner().getThisPaoSet().getApp() != null) {
+	   setFieldFlag(new GetFieldsName(getName()).getFields(), READONLY, true);
+	   setFieldFlag(new String[] { "FSALENUM" }, READONLY, true);
+	}
+	  }
+
+	  @Override
+	  public void fieldValidate(Object paoField, String fieldname) throws P2Exception {
+	      super.fieldValidate(paoField, fieldname);
+	      if(fieldname.equalsIgnoreCase("FSALENUM")){
+	          PaoSetRemote thisPaoSet = getThisPaoSet();
+	          for(int i=0;i< thisPaoSet.count();i++){
+	              PaoRemote pao = thisPaoSet.getPao(i);
+	              if(pao.getUniqueIDValue()!=getUniqueIDValue()&&pao.getString("FSALENUM").equals(getString("FSALENUM"))){
+	                  throw new P2AppException("","该销售助理已经添加过了");
+	              }
+	          }
+	      }
+	  }
+
+}

src/apps/tinvoiceapply/tinvoiceapply.java

@@ -6,6 +6,7 @@ import baseclass.tools.Math;
 import openapi.base.data.Row;
 import openapi.base.data.Rows;
 import openapi.base.data.db.DBConnect;
+import p2.p2server.P2Server;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSet;
 import p2.pao.PaoSetRemote;
@@ -139,8 +140,13 @@ public class tinvoiceapply extends PaoCust {
                     saorder.setValue("finvoicetaxnumber", getString("finvoicetaxnumber"), 11L);
                     saorder.setValue("finvoicename", getString("finvoicename"), 11L);
                     saorder.setValue("finvoiceaddress", getString("finvoiceaddress"), 11L);
-                }
+                }   
             }
+            PaoSetRemote tagents = P2Server.getP2Server().getPaoSet("tagents", P2Server.getP2Server().getSystemUserInfo());
+            tagents.setWhere("tagents.FAGENTNUM='"+getString("FAGENTNUM")+"'");
+            tagents.reset();
+            String fagentshortname = tagents.getPao(0).getString("FAGENTSHORTNAME");
+            sendEmail(getMailByHrGroup(getString("siteid") + "1010"), "开票申请", "开票申请单号：" + getString("FBILLNUM") + "已提交请处理，客户名称：" +fagentshortname+ ",提交人：" + getString("SUBMITBY") + "，备注：" + getString("FNOTES"));
         }
         setValue("fstatus", issubmit ? "提交" : "新建", 11L);
         setValue("submitby", issubmit ? getUserName() : "", 11L);

src/apps/twriteoffbill/twriteoffbillAppBean.java

@@ -20,11 +20,11 @@ public void initializeApp() throws P2Exception {
             } else {
                 String appname = getPao().getThisPaoSet().getApp();
                 String hrid = getPao().getUserName();
+                String siteid = getPao().getInsertSite();
                 String salenum = ((PaoCust) getPao()).getSalenumByHrid(getPao().getUserName());
                 if("WRITEOFF".equalsIgnoreCase(appname)  && salenum!=null && salenum.equals("ÏúÊÛÖúÀí")){
-                    databean.setAppWhere("fagentnum in (select fagentnum from tagents where siteid='HY' and fsalenum='"+hrid+"') and siteid ='HY'");
+                    databean.setAppWhere("fagentnum in (select tagentsales.fagentnum from tagentsales  where  fsalenum='"+hrid+"') and siteid ='"+siteid+"'");
                 }
-
                 int year = Calendar.getInstance().get(Calendar.YEAR);
                 databean.setDefaultQbe("createdate", ">=" + (year - 1) + "-01-01");
                 databean.reset();

src/base/baseclass/PaoCust.java

@@ -1279,11 +1279,11 @@ public class PaoCust extends Pao implements PaoRemote {
         }
         return map;
     }
-	public String[] getMailBySalesGroup(String fagentnum) throws P2Exception {
-	    PaoSetRemote email = getPaoSet("$sales_email", "salesassistant", "fsalenum in (select tagents.fsalenum from tagents where fagentnum = '"+fagentnum+"') and sales_email is not null");
-	    String[] emailaddress = getStrings(email, "sales_email");
-	    return emailaddress;
-	}
+    public String[] getMailBySalesGroup(String fagentnum,String siteid) throws P2Exception {
+        PaoSetRemote email = getPaoSet("$sales_email", "salesassistant", "fsalenum in (select fsalenum from tagentsales where fagentnum = '"+fagentnum+"'and siteid ='"+siteid+"') and sales_email is not null");
+        String[] emailaddress = getStrings(email, "sales_email");
+        return emailaddress;
+    }
 
 	public String getSalenumByHrid(String hrid) throws P2Exception {
 	    PaoSetRemote pp_users = P2Server.getP2Server().getPaoSet(