|
|
@@ -48,7 +48,6 @@ public class warrantycard extends Controller {
|
|
|
where.append(" and t1.sku ='" + whereObject.getString("sku") + "' ");
|
|
|
}
|
|
|
}
|
|
|
- pageSorting="t1.begdate desc";
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_warrantycard", "*");
|
|
|
querySQL.setAsyncRowCount(true);//设置为延迟查询总行数
|
|
|
querySQL.setTableAlias("t1");
|
|
|
@@ -58,8 +57,8 @@ public class warrantycard extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t5", "t5.unitid = t4.unitid AND t5.siteid = t4.siteid", "unitname");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t1.toagentnum = t6.agentnum AND t1.siteid = t6.siteid");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t7", "t7.sys_enterpriseid = t6.sys_enterpriseid AND t7.siteid = t6.siteid");
|
|
|
- querySQL.addQueryFields("toabbreviation","t7.abbreviation");
|
|
|
- querySQL.addQueryFields("toenterprisename","t7.enterprisename");
|
|
|
+ querySQL.addQueryFields("toabbreviation", "t7.abbreviation");
|
|
|
+ querySQL.addQueryFields("toenterprisename", "t7.enterprisename");
|
|
|
querySQL.setSiteid(siteid);
|
|
|
querySQL.setWhere(where.toString());
|
|
|
querySQL.setPage(pageSize, pageNumber);
|
|
|
@@ -106,8 +105,8 @@ public class warrantycard extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_tradefield ", "t8", "t8.sys_enterpriseid = t3.sys_enterpriseid AND t8.siteid = t3.siteid", "sa_saleareaid");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t9", "t1.toagentnum = t9.agentnum AND t1.siteid = t9.siteid");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t10", "t10.sys_enterpriseid = t9.sys_enterpriseid AND t10.siteid = t9.siteid");
|
|
|
- querySQL.addQueryFields("toabbreviation","t10.abbreviation");
|
|
|
- querySQL.addQueryFields("toenterprisename","t10.enterprisename");
|
|
|
+ querySQL.addQueryFields("toabbreviation", "t10.abbreviation");
|
|
|
+ querySQL.addQueryFields("toenterprisename", "t10.enterprisename");
|
|
|
|
|
|
querySQL.addQueryFields("topclassname", "t6.itemclassname");
|
|
|
querySQL.setSiteid(siteid);
|
|
|
@@ -129,7 +128,7 @@ public class warrantycard extends Controller {
|
|
|
if (rows.isEmpty()) {
|
|
|
return getErrReturnObject().setErrMsg("保修卡不存在").toString();
|
|
|
}
|
|
|
- if (getDate_Str(content.getDate("begindate")).compareTo(getDate_Str(rows.get(0).getDate("begdate")))>0) {
|
|
|
+ if (getDate_Str(content.getDate("begindate")).compareTo(getDate_Str(rows.get(0).getDate("begdate"))) > 0) {
|
|
|
return getErrReturnObject().setErrMsg("开始日期不能晚于原日期").toString();
|
|
|
}
|
|
|
Rows itemRows = dbConnect.runSqlQuery("select * from plm_item where siteid='" + siteid + "' and itemid=" + rows.get(0).getLong("itemid"));
|
|
|
@@ -149,7 +148,7 @@ public class warrantycard extends Controller {
|
|
|
updateSQL.setUniqueid(sa_warrantycardid);
|
|
|
updateSQL.setSiteid(siteid);
|
|
|
updateSQL.setValue("begdate", begindate);
|
|
|
- updateSQL.setValue("enddate", StringUtils.isBlank(enddate)?newDate.toString():enddate);
|
|
|
+ updateSQL.setValue("enddate", StringUtils.isBlank(enddate) ? newDate.toString() : enddate);
|
|
|
updateSQL.setValue("changeuserid", userid);
|
|
|
updateSQL.setValue("changeby", username);
|
|
|
updateSQL.setDateValue("changedate");
|
|
|
@@ -162,7 +161,7 @@ public class warrantycard extends Controller {
|
|
|
@CACHEING_CLEAN(apiClass = {warrantycard.class})
|
|
|
public String voidWarrantycard() throws YosException {
|
|
|
long sa_warrantycardid = content.getLong("sa_warrantycardid");
|
|
|
- String voidreason =content.getStringValue("voidreason");
|
|
|
+ String voidreason = content.getStringValue("voidreason");
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
Rows rows = dbConnect.runSqlQuery("select isvoid from sa_warrantycard where siteid='" + siteid
|
|
|
+ "' and sa_warrantycardid='" + sa_warrantycardid + "'");
|
