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

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

@@ -59,6 +59,14 @@ public class agents extends Controller {
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and t1.status='").append(whereObject.getString("status")).append("' ");
             }
+            if (whereObject.containsKey("outsigningstate") && whereObject.getJSONArray("outsigningstate").size() > 0) {
+                where.append(" and t1.signingstate not in (");
+                for (Object o : whereObject.getJSONArray("outsigningstate")) {
+                    where.append("'").append(o).append("'").append(",");
+                }
+                where.delete(where.lastIndexOf(","), where.lastIndexOf(",") + 1);
+                where.append(")");
+            }
         }
 //        SQLFactory sqlFactory = new SQLFactory(this, "经销商列表查询", pageSize, pageNumber, pageSorting);
 //        sqlFactory.addParameter_SQL("where", where);

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

@@ -112,7 +112,7 @@ public class sendrepair extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair_detail", "t4", "t1.sa_sendrepairid = t4.sa_sendrepairid AND t1.siteid = t4.siteid", "newspec", "newitemno", "newitemname",
                 "newitemid", "newsku", "agentcost", "practicalamount", "logisticscost", "logistics", "idearemarks", "disposition", "demand", "reason", "duty",
-                "stockdate", "enddate", "phonenumber", "name", "qty", "itemid", "sku", "price");
+                "stockdate", "enddate", "phonenumber", "name", "qty", "itemid", "sku");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t5", "t5.itemid = t4.itemid AND t5.siteid = t4.siteid", "itemname", "itemno", "spec", "model");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t5.unitid = t6.unitid AND t5.siteid = t6.siteid", "unitname");
         querySQL.addQueryFields("remarksdetail", "t4.remarks");
@@ -124,6 +124,21 @@ public class sendrepair extends Controller {
 
         Rows stockbillrows = dbConnect.runSqlQuery("select * from st_stockbill where sourceid='" + sa_sendrepairid + "' and sourceobject='sa_sendrepair'");
 
+        if (rows.isNotEmpty()) {
+            String sku = rows.get(0).getString("sku");
+            String itemid = rows.get(0).getString("itemid");
+            String sql = "select t3.defaultprice from st_stockbill_items_sku t1 " +
+                    "inner join st_stockbill t2 on t2.st_stockbillid=t1.st_stockbillid " +
+                    "inner join st_stockbill_items t3 on t3.st_stockbillid=t2.st_stockbillid " +
+                    "where  t1.sku='" + sku + "' and t2.type='销售出库' and t1.itemid='" + itemid + "'";
+            Rows rows1 = dbConnect.runSqlQuery(sql);
+            if (rows1.isNotEmpty()) {
+                rows.get(0).put("price", rows1.get(0).getBigDecimal("defaultprice"));
+            }
+        } else {
+            rows.get(0).put("price", "0");
+        }
+
 
         QuerySQL querySumSQL = SQLFactory.createQuerySQL(this, "sa_sendrepair_pj", "sa_sendrepairid");
         querySumSQL.setTableAlias("t1");
@@ -836,7 +851,7 @@ public class sendrepair extends Controller {
      */
     public ArrayList<String> updatefitemno(boolean istrue, Row sendrepairdetail) throws YosException {
         ArrayList<String> sqlList = new ArrayList<>();
-        Rows skurows = dbConnect.runSqlQuery("select * from sa_itemsku where siteid='"+siteid+"' and sku='" + sendrepairdetail.getString("sku") + "' and status!='报废'");
+        Rows skurows = dbConnect.runSqlQuery("select * from sa_itemsku where siteid='" + siteid + "' and sku='" + sendrepairdetail.getString("sku") + "' and status!='报废'");
         if (skurows.isEmpty()) {
             throw new YosException("序列号不存在或已作废");
         }

src/custom/restcontroller/webmanage/sale/serviceorder/SQL/序列号查询.sql

@@ -5,7 +5,8 @@ select * from ((SELECT
                     t5.address,
                     t5.enterprisename,
                     t5.abbreviation,
-                    case when ifnull(t6.cardno,'')='' then '未安装' else '已安装' end isinstalled,
+                    case when (LENGTH(t6.cardno)>0 and t6.isvoid=0) then '已安装' else '未安装' end isinstalled,
+                    case when current_date between t6.begdate and t6.enddate then '在保' else '过保' end warrantystatus,
                     t6.cardno,
                     t6.begdate,
                     t6.enddate,
@@ -20,7 +21,8 @@ select * from ((SELECT
                     t2.spec,
                     t3.unitname,
                     t7.name as customername,
-                    t7.phonenumber as customerphonenumber
+                    t7.phonenumber as customerphonenumber,
+                    t2.topclassnum
                 FROM sa_itemsku t1
                          LEFT JOIN plm_item t2 ON t1.itemid = t2.itemid AND t1.siteid = t2.siteid
                          LEFT JOIN plm_unit t3 ON t3.unitid = t2.unitid AND t3.siteid = t2.siteid
@@ -44,7 +46,8 @@ select * from ((SELECT
                     t5.address,
                     t5.enterprisename,
                     t5.abbreviation,
-                    case when ifnull(t6.cardno,'')='' then '未安装' else '已安装' end isinstalled,
+                    case when (LENGTH(t6.cardno)>0 and t6.isvoid=0) then '已安装' else '未安装' end isinstalled,
+                    case when current_date between t6.begdate and t6.enddate then '在保' else '过保' end warrantystatus,
                     t6.cardno,
                     t6.begdate,
                     t6.enddate,
@@ -59,7 +62,8 @@ select * from ((SELECT
                     t2.spec,
                     t3.unitname,
                     t7.name as customername,
-                    t7.phonenumber as customerphonenumber
+                    t7.phonenumber as customerphonenumber,
+                    t2.topclassnum
                 FROM sa_itemsku t1
                          INNER JOIN sa_agents a ON t1.sa_agentsid = a.sa_agentsid
                     AND t1.siteid = a.siteid