序列号已安装无法再次安装

src/custom/restcontroller/sale/order/Order.java

@@ -103,7 +103,13 @@ public class Order extends Controller {
             }
             //查询快递信息
             if(expressformrowsMap.containsKey(row.getString("sa_orderid"))){
-                row.put("expressform",expressformrowsMap.get(row.getString("sa_orderid")).get(0));
+                row.put("expressform_mailno",expressformrowsMap.get(row.getString("sa_orderid")).get(0).getString("mailno"));
+                row.put("expressform_txlogisticid",expressformrowsMap.get(row.getString("sa_orderid")).get(0).getString("txlogisticid"));
+
+            }else{
+                row.put("expressform_mailno","");
+                row.put("expressform_txlogisticid","");
+
             }
         }
 

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

@@ -611,7 +611,7 @@ public class serviceorder extends Controller {
                         + sa_serviceorderid + "' and  siteid='" + siteid + "'");
 
         Rows workorderRows = dbConnect
-                .runSqlQuery("select sa_workorderid,status,billno from sa_workorder where sa_serviceorderid ='"
+                .runSqlQuery("select sa_workorderid,status,billno,sa_serviceorderid from sa_workorder where sa_serviceorderid ='"
                         + sa_serviceorderid + "' and  siteid='" + siteid + "'");
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("此服务单不存在").toString();
@@ -619,6 +619,16 @@ public class serviceorder extends Controller {
             if (!rows.get(0).getString("status").equals("待受理")) {
                 return getErrReturnObject().setErrMsg("非待受理状态无法生成工单").toString();
             }
+            Rows serviceorderitems = dbConnect.runSqlQuery("select sku from sa_serviceorderitems where sa_serviceorderid="+sa_serviceorderid);
+            if(serviceorderitems.isNotEmpty()){
+                if(StringUtils.isNotBlank(serviceorderitems.get(0).getString("sku"))){
+                    if (dbConnect.runSqlQuery("select * from sa_warrantycard where sku='" + serviceorderitems.get(0).getString("sku") + "' and siteid='" + siteid + "' and isvoid=0").isNotEmpty()) {
+                        return getErrReturnObject().setErrMsg("该序列号已安装,无法再次安装").toString();
+                    }
+                }
+
+            }
+
         }
 
         if (!workorderRows.isEmpty()) {

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

@@ -291,7 +291,14 @@ public class stockbill extends Controller {
             row.put("billno_hong", "");
         }
         row.put("qty",rowsdetail.sum("qty"));
-        row.put("expressform",expressformrows);
+        if(expressformrows.isEmpty()){
+            row.put("expressform_mailno",expressformrows.get(0).getString("mailno"));
+            row.put("expressform_txlogisticid",expressformrows.get(0).getString("txlogisticid"));
+        }else{
+            row.put("expressform_mailno",expressformrows);
+            row.put("expressform_txlogisticid",expressformrows);
+        }
+
 
 
         return getSucReturnObject().setData(row).toString();
@@ -418,13 +425,21 @@ public class stockbill extends Controller {
 
         if(billtypes.contains("返修入库")){
             //querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model,sku,siteid FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model","sku");
-            QuerySQL querySQLDatail = SQLFactory.createQuerySQL(this, "st_stockbill_items","itemname","model","sku", "st_stockbillid").setTableAlias("t1");
+            QuerySQL querySQLDatail = SQLFactory.createQuerySQL(this, "st_stockbill_items","itemname","itemno","model","sku", "st_stockbillid").setTableAlias("t1");
             querySQLDatail.setWhere("t1.st_stockbillid",ids);
             Rows rowsdatail = querySQLDatail.query();
             RowsMap rowsdatailMap = rowsdatail.toRowsMap("st_stockbillid");
             for(Row row :rows){
                 if(rowsdatailMap.containsKey(row.getString("st_stockbillid"))){
-                    row.put("stockbillitems",rowsdatailMap.get(row.getString("st_stockbillid")));
+                    row.put("itemno",rowsdatailMap.get(row.getString("st_stockbillid")).get(0).getString("itemno"));
+                    row.put("itemname",rowsdatailMap.get(row.getString("st_stockbillid")).get(0).getString("itemname"));
+                    row.put("model",rowsdatailMap.get(row.getString("st_stockbillid")).get(0).getString("model"));
+                    row.put("sku",rowsdatailMap.get(row.getString("st_stockbillid")).get(0).getString("sku"));
+                }else{
+                    row.put("itemno","");
+                    row.put("itemname","");
+                    row.put("model","");
+                    row.put("sku","");
                 }
             }
 
@@ -441,7 +456,12 @@ public class stockbill extends Controller {
             RowsMap expressformrowsMap = expressformrows.toRowsMap("st_stockbillid");
             for(Row row :rows){
                 if(expressformrowsMap.containsKey(row.getString("st_stockbillid"))){
-                    row.put("expressform",expressformrowsMap.get(row.getString("st_stockbillid")));
+                    row.put("expressform_mailno",expressformrowsMap.get(row.getString("st_stockbillid")).get(0).getString("mailno"));
+                    row.put("expressform_txlogisticid",expressformrowsMap.get(row.getString("st_stockbillid")).get(0).getString("txlogisticid"));
+                }else{
+                    row.put("expressform_mailno","");
+                    row.put("expressform_txlogisticid","");
+
                 }
             }