服务申请单新增/编辑 增加 保修状态编辑

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

@@ -166,10 +166,10 @@ public class serviceorder extends Controller {
             sqlList.add(
                     DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "提交", "服务申请单提交成功").getSQL());
             Rows rowsdetails = dbConnect
-                    .runSqlQuery("select t1.sa_serviceorderitemsid,t1.cardno,t3.begdate,t3.enddate from sa_serviceorderitems t1 left join sa_warrantycard t3 on t1.cardno=t3.cardno and t1.siteid=t3.siteid and t3.isvoid=0 and t3.deleted=0  where t1.sa_serviceorderid ='"
+                    .runSqlQuery("select t1.sa_serviceorderitemsid,t1.cardno,t3.begdate,t3.enddate,t1.warrantystatus from sa_serviceorderitems t1 left join sa_warrantycard t3 on t1.cardno=t3.cardno and t1.siteid=t3.siteid and t3.isvoid=0 and t3.deleted=0  where t1.sa_serviceorderid ='"
                             + sa_serviceorderid + "' and t1.siteid='" + siteid + "'");
             for(Row row :rowsdetails){
-                if(StringUtils.isNotBlank(row.getString("cardno"))){
+                if(StringUtils.isNotBlank(row.getString("cardno")) && StringUtils.isBlank(row.getString("warrantystatus"))){
                     Date date = new Date();
                     if(StringUtils.isNotBlank(row.getString("enddate"))){
                         if (date.before(row.getDate("enddate"))) {

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

@@ -59,6 +59,7 @@ public class serviceorder extends Controller {
         String class1 = content.getStringValue("class1");
         String class2 = content.getStringValue("class2");
         String reason = content.getStringValue("reason");
+        String warrantystatus = content.getStringValue("warrantystatus");
         String province = content.getStringValue("province");
         String city = content.getStringValue("city");
         String county = content.getStringValue("county");
@@ -188,6 +189,7 @@ public class serviceorder extends Controller {
         insertSQL.setValue("sku", sku);
         insertSQL.setValue("cardno", cardno);
         insertSQL.setValue("reason", reason);
+        insertSQL.setValue("warrantystatus", warrantystatus);
         sqlList.add(insertSQL.getSQL());
 
         dbConnect.runSqlUpdate("delete from sa_serviceorderitems where siteid='" + siteid + "' and sa_serviceorderid=" + sa_serviceorderid);

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

@@ -14,6 +14,7 @@ import org.apache.poi.xssf.usermodel.*;
 import restcontroller.R;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 
 public class toolscode extends Controller {
@@ -339,7 +340,7 @@ public class toolscode extends Controller {
         skuQuery.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid", "itemid", "itemno", "itemname", "spec", "model", "topclassnum");
         skuQuery.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t2.unitid=t3.unitid");
         skuQuery.addJoinTable(JOINTYPE.left, "st_stock", "t4", "t4.stockno=t2.stockno");
-        skuQuery.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t1.sys_enterpriseid=t5.sys_enterpriseid", "t5.enterprisename");
+        skuQuery.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t1.sys_enterpriseid=t5.sys_enterpriseid", "t5.enterprisename","abbreviation");
         skuQuery.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t1.sys_enterpriseid=t6.sys_enterpriseid", "t6.agentnum");
         skuQuery.addJoinTable(JOINTYPE.left, "st_stock", "t7", "t1.stockid=t7.stockid", "stockno", "stockname");
 
@@ -369,7 +370,7 @@ public class toolscode extends Controller {
         Rows skuRows = skuQuery.query();
         if (skuRows.isNotEmpty()) {
             RowsMap skuChangeRowsMap = SQLFactory.createQuerySQL(this, "sa_itemsku_change", "sa_itemskuid", "changenotes").setWhere("sa_itemskuid", skuRows.toArrayList("sa_itemskuid")).setOrderBy("sa_itemsku_changeid desc").query().toRowsMap("sa_itemskuid");
-            RowsMap warrantycardRowsMap = SQLFactory.createQuerySQL(this, "sa_warrantycard", "sku","name", "phonenumber","address","sa_customersid","province","city","county").setWhere("sku", skuRows.toArrayList("sku")).query().toRowsMap("sku");
+            RowsMap warrantycardRowsMap = SQLFactory.createQuerySQL(this, "sa_warrantycard", "sku","name", "phonenumber","address","sa_customersid","province","city","county","begdate","enddate","cardno").setWhere("sku", skuRows.toArrayList("sku")).setWhere(" isvoid=0 ").query().toRowsMap("sku");
 
             for (Row skuRow : skuRows) {
                 String sa_itemskuid = skuRow.getString("sa_itemskuid");
@@ -389,6 +390,19 @@ public class toolscode extends Controller {
                     skuRow.put("province", warrantycardRow.getString("province"));
                     skuRow.put("city", warrantycardRow.getString("city"));
                     skuRow.put("county", warrantycardRow.getString("county"));
+                    skuRow.put("cardno", warrantycardRow.getString("cardno"));
+                    skuRow.put("begdate", warrantycardRow.getString("begdate"));
+                    skuRow.put("enddate", warrantycardRow.getString("enddate"));
+                    Date date = new Date();
+                    if(StringUtils.isNotBlank(warrantycardRow.getString("enddate"))){
+                        if (date.before(warrantycardRow.getDate("enddate"))) {
+                            skuRow.put("warrantystatus", "保内");
+                        }else{
+                            skuRow.put("warrantystatus", "保外");
+                        }
+                    }else{
+                        skuRow.put("warrantystatus", "保外");
+                    }
                 }else{
                     skuRow.put("name", "");
                     skuRow.put("phonenumber", "");
@@ -397,6 +411,9 @@ public class toolscode extends Controller {
                     skuRow.put("province", "");
                     skuRow.put("city", "");
                     skuRow.put("county", "");
+                    skuRow.put("begdate", "");
+                    skuRow.put("enddate", "");
+                    skuRow.put("warrantystatus", "");
                 }
             }
         }