订单增加回签单字段

src/apps/sainvoice/sainvoice.java

@@ -373,6 +373,7 @@ public class sainvoice extends PaoCust {
                 setValue("fprovince", saorder.getString("fprovince"), 11L);
                 setValue("fcity", saorder.getString("fcity"), 11L);
                 setValue("fcounty", saorder.getString("fcounty"), 11L);
+                setValue("fsignbacknum", saorder.getString("fsignbacknum"), 11L);
             }
         }
     }

src/apps/salogis/salogis.java

@@ -63,6 +63,7 @@ public class salogis extends PaoCust {
         String[] faddress = getDistinctString(paoset, "faddress", true);
         String[] fcontact = getDistinctString(paoset, "fcontact", true);
         String[] fphonenumber = getDistinctString(paoset, "fphonenumber", true);
+        String[] fsignbacknum = getDistinctString(paoset, "fsignbacknum", true);
         if (ffreightstatuss.length > 1) {
             throw new P2AppException("", "不可同时添加两种运费状态的发货单");
         }
@@ -84,9 +85,12 @@ public class salogis extends PaoCust {
         if (fphonenumber.length > 1) {
             throw new P2AppException("", "不可同时添加两个不同联系方式的发货单");
         }
+        if (fsignbacknum.length > 1) {
+            throw new P2AppException("", "不可同时添加两个回签单的发货单");
+        }
         if (!salogisdetailSet.isEmpty()) {
             DBConnect dbConnect = new DBConnect();
-            Rows rows = dbConnect.runSqlQuery("select t1.faddress,t1.fcontact,t1.fphonenumber from SALOGISDETAIL t1 inner join sainvoice t2 on t1.fsourceid=t2.sainvoiceid and t1.FSOURCEOBJECT='sainvoice'and t1.fparentid=" + getUniqueIDValue());
+            Rows rows = dbConnect.runSqlQuery("select t2.faddress,t2.fcontact,t2.fphonenumber,t2.fsignbacknum from SALOGISDETAIL t1 inner join sainvoice t2 on t1.fsourceid=t2.sainvoiceid and t1.FSOURCEOBJECT='sainvoice'and t1.fparentid=" + getUniqueIDValue());
             for (Row row : rows) {
                 if (faddress.length == 1 && !faddress[0].equals(row.getString("faddress"))) {
                     throw new P2AppException("", "不可同时添加两个不同收货地址的发货单");
@@ -97,9 +101,11 @@ public class salogis extends PaoCust {
                 if (fphonenumber.length == 1 && !fphonenumber[0].equals(row.getString("fphonenumber"))) {
                     throw new P2AppException("", "不可同时添加两个不同联系方式的发货单");
                 }
+                if (fsignbacknum.length == 1 && !fsignbacknum[0].equals(row.getString("fsignbacknum"))) {
+                    throw new P2AppException("", "不可同时添加两个回签单的发货单");
+                }
             }
         }
-
         BatchAdd(paoset, new String[]{"sainvoiceid", "$SAINVOICE"}, salogisdetailSet, new String[]{"fsourceid", "fsourceobject"}, true);
 
         if (!salogisdetailSet.isEmpty()) {
@@ -113,6 +119,7 @@ public class salogis extends PaoCust {
                 setValue("fprovince", sainvoiceSet.getPao(0).getString("fprovince"), 11L);
                 setValue("fcity", sainvoiceSet.getPao(0).getString("fcity"), 11L);
                 setValue("fcounty", sainvoiceSet.getPao(0).getString("fcounty"), 11L);
+                setValue("fsignbacknum", sainvoiceSet.getPao(0).getString("fsignbacknum"), 11L);
             }
         }
         String[] sainvocieids = getStrings(salogisdetailSet, "fsourceid");

src/apps/saorder/saorder.java

@@ -634,6 +634,11 @@ public class saorder extends BaseSaorder {
     @Override
     public void submitvalidate(boolean issubmit) throws P2Exception {
         super.submitvalidate(issubmit);
+        if ("".equals(getString("fsignbacknum"))) {
+            if ("工具订单".equals(getString("ftype")) || "标准订单".equals(getString("ftype")) || "项目订单".equals(getString("ftype"))) {
+                throw new P2AppException("", "回签单信息不可为空！");
+            }
+        }
         if ("工具借出单".equals(getString("ftype"))) {
             submitvalidate_tools(issubmit);
             return;

src/rest/openapi/restcontroller/wechatapp/saorder/SQL/订单主界面查询_表头.sql

@@ -1,6 +1,7 @@
 select t1.saorderid,--땐데ID
        t1.fsonum,--땐데긍뵀
        t1.ftype,--땐데잚謹
+       t1.fsignbacknum,--쀼푯데
        t1.ftypemx,
        convert(varchar(10), t1.fdate, 120)                      fdate,--땐데휑퍅
        t1.fagentnum,--쒔饋�긍쯤

src/rest/openapi/restcontroller/wechatapp/saorder/SQL/订单列表查询.sql

@@ -2,6 +2,7 @@ select t1.ftype,
        t1.ftypemx,
        t1.saorderid,
        t1.fsonum,
+       t1.fsignbacknum,--»ØÇ©µ¥
        convert(varchar(10), t1.fdate, 120)  fdate,
        t1.fcontact,
        t1.fprovince,t1.fcity,t1.fcounty,

src/rest/openapi/restcontroller/wechatapp/saorder/SQL/订单列表查询1.sql

@@ -2,6 +2,7 @@ select t1.ftype,
        t1.ftypemx,
        t1.saorderid,
        t1.fsonum,
+       t1.fsignbacknum,--»ØÇ©µ¥
        convert(varchar(10), t1.fdate, 120)  fdate,
        t1.fcontact,
        t1.fprovince,t1.fcity,t1.fcounty,

src/rest/openapi/restcontroller/wechatapp/saorder/SQL/订单列表查询_业务员.sql

@@ -1,6 +1,7 @@
 select t1.ftype,
        t1.saorderid,
        t1.fsonum,
+       t1.fsignbacknum,--»ØÇ©µ¥
        convert(varchar(10), t1.fdate, 120)           fdate,
        t1.fcontact,
        t1.fprovince,

src/rest/openapi/restcontroller/wechatapp/saorder/tools/SaorderTool.java

@@ -362,6 +362,7 @@ public class SaorderTool extends BaseClass {
             double fuseflamount = content.getDouble("fuseflamount");
 
             String fbrand = content.getString("fbrand");//品牌
+            String fsignbacknum = content.getString("fsignbacknum");//回签单
 
             String fsaletype = "";
             if (content.containsKey("fsaletype") && !content.getString("fsaletype").equalsIgnoreCase("null")) {
@@ -372,18 +373,18 @@ public class SaorderTool extends BaseClass {
                 fprojectnotes = content.getString("fprojectnotes");
             }
             String fprojectnum = "";
-            if (content.containsKey("fprojectnum")&& !content.getString("fprojectnum").equalsIgnoreCase("null")) {
+            if (content.containsKey("fprojectnum") && !content.getString("fprojectnum").equalsIgnoreCase("null")) {
                 fprojectnum = nullToStr(content.getString("fprojectnum"));//项目编号
             }
             String fpayagentnum = "";
-            if (content.containsKey("fpayagentnum")&& !content.getString("fpayagentnum").equalsIgnoreCase("null")) {
+            if (content.containsKey("fpayagentnum") && !content.getString("fpayagentnum").equalsIgnoreCase("null")) {
                 fpayagentnum = nullToStr(content.getString("fpayagentnum"));//结算客户
             }
             if ("".equals(fpayagentnum)) {
                 fpayagentnum = fagentnum;
             }
             String frecagentnum = "";
-            if (content.containsKey("frecagentnum")&& !content.getString("frecagentnum").equalsIgnoreCase("null")) {
+            if (content.containsKey("frecagentnum") && !content.getString("frecagentnum").equalsIgnoreCase("null")) {
                 frecagentnum = nullToStr(content.getString("frecagentnum"));//收货客户
             }
             if ("".equals(frecagentnum)) {
@@ -423,6 +424,7 @@ public class SaorderTool extends BaseClass {
             saorder.setValue("fisusefl", fisusefl.equals("1"), 11L);
             saorder.setValue("fsaletype", fsaletype, 11L);
             saorder.setValue("fprojectnotes", fprojectnotes, 11L);
+            saorder.setValue("fsignbacknum", fsignbacknum, 11L);
             if (fisusefl_old && fisusefl.equals("0")) {
                 saorder.setValue("fagentuseflamount", 0, 11L);
             } else if (fuseflamount > 0) {