|
|
@@ -8,6 +8,8 @@ import openapi.base.SQLFactory;
|
|
|
import openapi.base.data.Row;
|
|
|
import openapi.base.data.Rows;
|
|
|
import openapi.base.data.db.DBConnect;
|
|
|
+import oracle.net.aso.i;
|
|
|
+
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.commons.lang.time.DateFormatUtils;
|
|
|
import p2.p2server.P2Server;
|
|
|
@@ -258,11 +260,20 @@ public class Afterserviceorder extends Controller {
|
|
|
remote.setValue("ftext",afterserviceorder.getPao(0).getString("fnotes"),11l);
|
|
|
remote.setValue("ftype",where.getString("ftype"),2l);
|
|
|
remote.setValue("TEMPLATENUM",where.getString("fworknum"),2l);
|
|
|
+
|
|
|
String fsonum=afterserviceorder.getPao(0).getString("fsonum");
|
|
|
DBConnect connect = new DBConnect();
|
|
|
- SQLFactory factory = new SQLFactory(this, "查询订单收货日期");
|
|
|
- factory.addParameter("fsonum", fsonum);
|
|
|
- Rows rows = connect.runSqlQuery(factory.getSQL());
|
|
|
+ SQLFactory factory = null;
|
|
|
+ if(siteid.equals("TZ")) {
|
|
|
+ factory = new SQLFactory(this, "查询台州订单收货日期");
|
|
|
+ }else if(siteid.equals("HY")) {
|
|
|
+ factory = new SQLFactory(this, "查询订单收货日期");
|
|
|
+ }
|
|
|
+ Rows rows = new Rows();
|
|
|
+ if(fsonum!=null && fsonum.length()>0) {
|
|
|
+ factory.addParameter("fsonum", fsonum);
|
|
|
+ rows = connect.runSqlQuery(factory.getSQL());
|
|
|
+ }
|
|
|
if(!rows.isEmpty()) {
|
|
|
Date receivedate=rows.get(0).getDate("receivedate");
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
@@ -337,6 +348,14 @@ public class Afterserviceorder extends Controller {
|
|
|
getpaoset.reset();
|
|
|
if(getpaoset.isEmpty())return getReturnObject_err("没有该服务单").toString();
|
|
|
PaoRemote remote = getpaoset.getPao(0);
|
|
|
+ if(where.containsKey("servicetype")) {
|
|
|
+ if(where.getString("servicetype").equals("售中") || where.getString("servicetype").equals("售中")) {
|
|
|
+ if(!where.containsKey("fsonum")) {
|
|
|
+ return getReturnObject_err("售中及售后的服务单需添加关联订单号").toString();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ remote.setValue("servicetype",where.getString("servicetype"),11l);
|
|
|
+ }
|
|
|
if(where.containsKey("fsonum"))
|
|
|
remote.setValue("fsonum",where.getString("fsonum"),11l);
|
|
|
if(where.containsKey("fprovince"))
|
|
|
@@ -358,6 +377,10 @@ public class Afterserviceorder extends Controller {
|
|
|
remote.setValue("appsystem",where.getString("appsystem"),11l);
|
|
|
if(where.containsKey("errcategory"))
|
|
|
remote.setValue("errcategory",where.getString("errcategory"),11l);
|
|
|
+ if(where.containsKey("servicebegindate"))
|
|
|
+ remote.setValue("servicebegindate",where.getString("servicebegindate"),11l);
|
|
|
+ if(where.containsKey("serviceenddate"))
|
|
|
+ remote.setValue("serviceenddate",where.getString("serviceenddate"),11l);
|
|
|
|
|
|
|
|
|
if(where.containsKey("fnotes"))
|
|
|
@@ -582,13 +605,30 @@ public class Afterserviceorder extends Controller {
|
|
|
Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='APPSYSTEM' order by SEQUENCE");
|
|
|
return getReturnObject_suc(rows,false).toString();
|
|
|
}
|
|
|
- /**获取客诉大类**/
|
|
|
+ /**获取服务分类**/
|
|
|
public String errcategory(){
|
|
|
DBConnect dbConnect=new DBConnect();
|
|
|
Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='ERRCATEGORY' order by SEQUENCE");
|
|
|
return getReturnObject_suc(rows,false).toString();
|
|
|
}
|
|
|
|
|
|
+ /**服务分类查询**/
|
|
|
+ public String servicetypeList(){
|
|
|
+ Rows rows=new Rows();
|
|
|
+ Row row1=new Row();
|
|
|
+ row1.put("value","售前");
|
|
|
+ Row row2=new Row();
|
|
|
+ row2.put("value","售中");
|
|
|
+ Row row3=new Row();
|
|
|
+ row3.put("value","售后");
|
|
|
+ Row row4=new Row();
|
|
|
+ row4.put("value","历史售后");
|
|
|
+ rows.add(row1);
|
|
|
+ rows.add(row2);
|
|
|
+ rows.add(row3);
|
|
|
+ rows.add(row4);
|
|
|
+ return getReturnObject_suc(rows,true).toString();
|
|
|
|
|
|
+}
|
|
|
|
|
|
}
|
