添加查询培训商品字段及逻辑变更

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/MyHyconfirmationorder.java

@@ -121,6 +121,15 @@ public class MyHyconfirmationorder extends Controller {
 							 if(!StringUtils.isBlank(HYORDERNODE_TITEM.getPao(i).getString("fitemno"))) {
 								 remote1.setValue("fitemno", HYORDERNODE_TITEM.getPao(i).getString("fitemno"));
 							 }
+							 if(!StringUtils.isBlank(HYORDERNODE_TITEM.getPao(i).getString("fitemname"))) {
+								 remote1.setValue("fitemname", HYORDERNODE_TITEM.getPao(i).getString("fitemname"));
+							 }
+							 if(!StringUtils.isBlank(HYORDERNODE_TITEM.getPao(i).getString("fmodel"))) {
+								 remote1.setValue("fmodel", HYORDERNODE_TITEM.getPao(i).getString("fmodel"));
+							 }
+							 if(!StringUtils.isBlank(HYORDERNODE_TITEM.getPao(i).getString("fspec"))) {
+								 remote1.setValue("fspec", HYORDERNODE_TITEM.getPao(i).getString("fspec"));
+							 }
 							 if(!StringUtils.isBlank(HYORDERNODE_TITEM.getPao(i).getString("fqty"))) {
 								 remote1.setValue("fqty", HYORDERNODE_TITEM.getPao(i).getString("fqty"));
 							 }

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/SQL/售后服务确认单商品查询.sql

@@ -1,4 +1,4 @@
-select t1.fitemno,t1.fitemname,t1.fspec,t1.fmodel,t2.fitemclsname,t.fqty from HYCONFIRMATIONORDER_TITEM t
+select t.fitemno,t.fitemname,t.fspec,t.fmodel,t.fqty from HYCONFIRMATIONORDER_TITEM t
 left join titem t1 on t.FITEMNO=t1.FITEMNO and t.siteid=t1.siteid
 left join TITEMCLASS_VIEW t2 on t2.FITEMCLSNUM=t1.FSALECLSNUM and  t2.fclasstype='ÓªÏúÀà±ð'and t2.siteid=t1.siteid
 where fparentid=$fparentid$

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/HyWorkOrder.java

@@ -426,7 +426,7 @@ public class HyWorkOrder extends Controller {
 						+ where.getString("frownum") + "'");
 				
 				/** ½Úµã¹ØÁªÅàѵÎïÁϲéѯ **/
-				Rows rows_traintitem = dbConnect.runSqlQuery("select t.fitemno,t2.fitemname,t2.fmodel,t2.fspec,t.fqty  from HYORDERNODE_TITEM t left join titem t2 on t.fitemno=t2.fitemno and t.siteid=t2.siteid\n"
+				Rows rows_traintitem = dbConnect.runSqlQuery("select t.fitemno,t.fitemname,t.fmodel,t.fspec,t.fqty  from HYORDERNODE_TITEM t left join titem t2 on t.fitemno=t2.fitemno and t.siteid=t2.siteid\n"
 						+ "where EXISTS(select 1 from hyordernode t1 where t1.hyordernodeid=t.fparentid and t1.hyordernodeid="
 						+ rowdetail.getInteger("ownerid") + ") and t.siteid='" + siteid + "'");
 				
@@ -562,6 +562,15 @@ public class HyWorkOrder extends Controller {
 								if(resultObject.containsKey("fitemno") && resultObject.getString("fitemno")!=null && resultObject.getString("fitemno").length()!=0) {
 									remote.setValue("fitemno", resultObject.getString("fitemno"), 2l);
 								}
+								if(resultObject.containsKey("fitemname") && resultObject.getString("fitemname")!=null && resultObject.getString("fitemno").length()!=0) {
+									remote.setValue("fitemname", resultObject.getString("fitemname"), 2l);
+								}
+								if(resultObject.containsKey("fmodel") && resultObject.getString("fmodel")!=null && resultObject.getString("fitemno").length()!=0) {
+									remote.setValue("fmodel", resultObject.getString("fmodel"), 2l);
+								}
+								if(resultObject.containsKey("fspec") && resultObject.getString("fspec")!=null && resultObject.getString("fitemno").length()!=0) {
+									remote.setValue("fspec", resultObject.getString("fspec"), 2l);
+								}
 								if(resultObject.containsKey("fqty") && resultObject.getString("fqty")!=null && resultObject.getString("fqty").length()!=0) {
 									remote.setValue("fqty", resultObject.getString("fqty"), 2l);
 								}