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

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -250,11 +250,6 @@ public class OrderItems extends Controller {
         } else {
             dbConnect.runSqlUpdate("UPDATE sa_order set abstract ='' WHERE sa_orderid='" + sa_orderid + "'");
         }
-
-        if (systemclient.equalsIgnoreCase("wechatsaletool")) {
-            rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,sa_orderitems_v,itemid from sa_orderitems WHERE sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
-            return getSucReturnObject().setData(rows).toString();
-        }
         if(type.equals("配件订单")){
             dbConnect.runSqlUpdate("UPDATE sa_order o JOIN (SELECT  sa_orderid,GROUP_CONCAT(DISTINCT delivery SEPARATOR '+') AS delivery FROM sa_orderitems where sa_orderid="+sa_orderid+" GROUP BY sa_orderid) od ON o.sa_orderid = od.sa_orderid SET  o.delivery = od.delivery ");
         }
@@ -292,6 +287,12 @@ public class OrderItems extends Controller {
             }
         }
         dbConnect.runSqlUpdate(sqlList);
+
+        if (systemclient.equalsIgnoreCase("wechatsaletool")) {
+            rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,sa_orderitems_v,itemid from sa_orderitems WHERE sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
+            return getSucReturnObject().setData(rows).toString();
+        }
+
         return getSucReturnObject().toString();
     }
 

src/custom/restcontroller/webmanage/sale/salestarget/SQL/企业-业绩目标完成列表.sql

@@ -24,7 +24,7 @@ from sa_salestarget m
          LEFT JOIN sa_salestarget m4 ON m4.year = m.year and m4.point = 4 and m.sys_enterpriseid = m4.sys_enterpriseid
          LEFT JOIN sys_enterprise t1 on t1.sys_enterpriseid=m.sys_enterpriseid
          LEFT JOIN sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid
-
+        where $where1$
 ORDER BY m.year desc
 
 

src/custom/restcontroller/webmanage/sale/salestarget/enterprisetarget.java

@@ -166,14 +166,25 @@ public class enterprisetarget extends Controller {
     public String selectList() throws YosException {
         ArrayList<Long> sys_enterpriseids = new ArrayList<>();
         StringBuffer where = new StringBuffer(" 1=1 ");
+        StringBuffer where1 = new StringBuffer(" 1=1 ");
         if (!content_where.getStringValue("year").isEmpty()) {
             where.append(" and(");
             where.append("year ='").append(content_where.getString("year")).append("' ");
             where.append(")");
         }
+
         if (!content_where.getStringValue("sys_enterpriseid").isEmpty()) {
             sys_enterpriseids.add(content_where.getLong("sys_enterpriseid"));
         }
+        if (content_where.containsKey("tablefilter")) {
+            if(content_where.getJSONObject("tablefilter").containsKey("enterprisename")){
+                if(StringUtils.isNotBlank(content_where.getJSONObject("tablefilter").getStringValue("enterprisename"))){
+                    where1.append(" and(");
+                    where1.append(" t1.enterprisename like '%").append(content_where.getJSONObject("tablefilter").getStringValue("enterprisename")).append("%' ");
+                    where1.append(")");
+                }
+            }
+        }
 
         long totalPage = 0;
         long totalRows = 0;
@@ -191,6 +202,7 @@ public class enterprisetarget extends Controller {
 
         SQLFactory sqlFactory = new SQLFactory(this, "企业-业绩目标完成列表");
         sqlFactory.addParameter_SQL("where", where);
+        sqlFactory.addParameter_SQL("where1", where1);
         sqlFactory.addParameter_in("sys_enterpriseids", sys_enterpriseids);
         sqlFactory.addParameter("siteid", siteid);
         String sql = sqlFactory.getSQL();

src/custom/restcontroller/webmanage/sale/serviceorder/serviceorder.java

@@ -813,13 +813,13 @@ public class serviceorder extends Controller {
                     if(StringUtils.isNotBlank(rows.get(0).getString("verificationdate"))){
                         if(isMoreThanOneHourUsingCalendar(rows.get(0).getDate("verificationdate"),new Date())){
                             Sms sms = new Sms();
-                            sms.sendout(Sms.SmsType.PassWord,customerphone, Parameter.getString("chuanglan_sms_model_password"), new String[]{verificationCode});
+                            sms.sendout(Sms.SmsType.Notice,customerphone, "尊敬的用户您好，您的工单服务已完成，完工验证码是"+verificationCode+"。");
                             message_map.put(customerphone, new VerificationManage(verificationCode));
                             dbConnect.runSqlUpdate("update sa_workorder set verificationdate=CURRENT_TIME where sa_workorderid="+sa_workorderid);
                         }
                     }else{
                         Sms sms = new Sms();
-                        sms.sendout(Sms.SmsType.PassWord,customerphone, Parameter.getString("chuanglan_sms_model_password"), new String[]{verificationCode});
+                        sms.sendout(Sms.SmsType.Notice,customerphone, "尊敬的用户您好，您的工单服务已完成，完工验证码是"+verificationCode+"。");
                         message_map.put(customerphone, new VerificationManage(verificationCode));
                         dbConnect.runSqlUpdate("update sa_workorder set verificationdate=CURRENT_TIME where sa_workorderid="+sa_workorderid);
                     }

src/custom/restcontroller/webmanage/sale/stockbill/stockbill.java

@@ -202,20 +202,19 @@ public class stockbill extends Controller {
         querySQL.setWhere("t1.st_stockbillid",st_stockbillids);
         Rows rows = querySQL.query();
         RowsMap rowsMap =rows.toRowsMap("st_stockbillid");
-        RowsMap periodrowsMap =dbConnect.runSqlQuery("select CONCAT(year, '-',LPAD(month, 2, '0')) period from st_period where isclose=1").toRowsMap("period");
-        if(periodrowsMap.containsKey(period)){
+        RowsMap periodrowsMap =dbConnect.runSqlQuery("select CONCAT(year, '-',LPAD(month, 2, '0')) period,isclose from st_period").toRowsMap("isclose");
+
+        if(periodrowsMap.get("1").toRowsMap("period").containsKey(period)){
             return getErrReturnObject().setErrMsg("原单据会计期间已关闭，不可调整").toString();
         }
         for (Object o : st_stockbillids) {
             long st_stockbillid = Long.parseLong(o.toString());
             if(rowsMap.containsKey(st_stockbillid)){
                 if(rowsMap.get(st_stockbillid).get(0).getString("status").equals("审核")){
-                    if (periodrowsMap.containsKey(period)) {
-                        if(rowsMap.get(period).toRowsMap("isclose").containsKey("1")){
-                            batchDeleteErr.addErr(st_stockbillid, "原单据会计期间已关闭，不可调整");
-                            continue;
-                        }
-                    }else{
+                    if (periodrowsMap.get("1").toRowsMap("period").containsKey(period)) {
+                        batchDeleteErr.addErr(st_stockbillid, "原单据会计期间已关闭，不可调整");
+                        continue;
+                    }else if(!periodrowsMap.get("0").toRowsMap("period").containsKey(period)){
                         batchDeleteErr.addErr(st_stockbillid, "原单据会计期间未生成，不可调整");
                         continue;
                     }

src/custom/service/SQL/收入凭证新增.sql

@@ -1,6 +1,6 @@
 insert into sa_cashbill (sa_cashbillid, siteid, createuserid, createby, createdate, changeuserid, changeby, changedate,
                          sys_enterpriseid, sa_accountclassid, type, status, checkby, checkdate, billno, amount,
-                         class, subclass, source, sourcenote, ownertable, ownerid, remarks)
+                         class, subclass, source, sourcenote, ownertable, ownerid, remarks,billdate)
 values ($sa_cashbillid$, $siteid$, $userid$, $username$, CURRENT_TIME, $userid$, $username$, CURRENT_TIME,
         $sys_enterpriseid$, $sa_accountclassid$, 1, '审核', $username$, CURRENT_TIME, $billno$, $amount$,
-        '货款', '回款', '银企直联', '银企直联', 'sa_bankstatement', $ownerid$, $remarks$)
+        '货款', '回款', '银企直联', '银企直联', 'sa_bankstatement', $ownerid$, $remarks$,CURRENT_TIME)

src/custom/service/SQL/收支凭证新增.sql

@@ -1,4 +1,4 @@
 insert into sa_cashbill (siteid, sa_cashbillid, createuserid,createby, createdate, billno,changeuserid,changeby, changedate,checkby,checkdate,
-                         sys_enterpriseid, sa_accountclassid,type,remarks,amount,status,source,sourcenote,ownertable,ownerid,balance,sa_cashbillid_rebate,class,subclass,period,updatek3flag)
+                         sys_enterpriseid, sa_accountclassid,type,remarks,amount,status,source,sourcenote,ownertable,ownerid,balance,sa_cashbillid_rebate,class,subclass,period,updatek3flag,billdate)
 values ($siteid$, $sa_cashbillid$,$userid$,$username$, CURRENT_TIME, $billno$,$userid$, $username$, CURRENT_TIME,$checkby$,$checkdate$,$sys_enterpriseid$,$sa_accountclassid$,$type$,$remarks$,
-        $amount$,$status$,$source$,$sourcenote$,$ownertable$,$ownerid$,$balance$,$sa_cashbillid_rebate$,$class$,$subclass$,current_date,$updatek3flag$);
+        $amount$,$status$,$source$,$sourcenote$,$ownertable$,$ownerid$,$balance$,$sa_cashbillid_rebate$,$class$,$subclass$,current_date,$updatek3flag$,CURRENT_TIME);

src/custom/service/SQL/银企直联流水账新增.sql

@@ -1,6 +1,6 @@
 insert into sa_bankstatement(sa_bankstatementid, siteid, banktype, accname, accno, sys_enterpriseid, tranflow,
                              oppbkname, oppname, oppaccno, amount, trantime, notes, remarks, status, sa_cashbillid,
-                             createdate, changeuserid, changeby, changedate, response)
+                             createdate, changeuserid, changeby, changedate, response,xncardno)
 values ($sa_bankstatementid$, $siteid$, $banktype$, $accname$, $accno$, $sys_enterpriseid$, $tranflow$, $oppbkname$,
         $oppname$, $oppaccno$, $amount$, $trantime$, $notes$, $remarks$, $status$, $sa_cashbillid$, $createdate$, 0,
-        $username$, $createdate$, $response$)
+        $username$, $createdate$, $response$,$xncardno$)