Merge remote-tracking branch 'origin/develop' into develop

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

@@ -323,7 +323,7 @@ public class stockbill extends Controller {
     @CACHEING_CLEAN(apiClass = {stockbill.class, stockbillitems.class, Order.class, OrderItems.class,restcontroller.sale.stockbill.stockbill.class})
     public String check() throws YosException {
         Long st_stockbillid = content.getLong("st_stockbillid");
-        beans.stockbill.stockbill.check(this,st_stockbillid,true);
+        beans.stockbill.Stockbill.check(this,st_stockbillid,true);
         return getSucReturnObject().toString();
     }
 
@@ -331,7 +331,7 @@ public class stockbill extends Controller {
     @CACHEING_CLEAN(apiClass = {stockbill.class, stockbillitems.class, Order.class, OrderItems.class,stockbill.class,restcontroller.sale.stockbill.stockbill.class})
     public String uncheck() throws YosException {
         Long st_stockbillid = content.getLong("st_stockbillid");
-        beans.stockbill.stockbill.check(this,st_stockbillid,false);
+        beans.stockbill.Stockbill.check(this,st_stockbillid,false);
         return getSucReturnObject().toString();
     }
 

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单工作预设信息新增.sql

@@ -1,4 +1,4 @@
 insert into sa_workpreset (siteid, sa_workpresetid,createuserid,createby,createdate,changeuserid,changeby, changedate,
-                                workname,remarks,additem,itemtype,addperson,contractupload,fileupload,textedit,confirm,confirm_options,amountpay,required,signature)
+                                workname,remarks,additem,itemtype,addperson,contractupload,fileupload,textedit,confirm,confirm_options,amountpay,required,signature,questionedit,questionoption)
 values ($siteid$, $sa_workpresetid$,$userid$,$username$, CURRENT_TIME,$userid$, $username$, CURRENT_TIME, $workname$,$remarks$,$additem$,$itemtype$,$addperson$,$contractupload$,$fileupload$,
-        $textedit$,$confirm$,$confirm_options$,$amountpay$,$required$,$signature$);
+        $textedit$,$confirm$,$confirm_options$,$amountpay$,$required$,$signature$,$questionedit$,$questionoption$);

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单工作预设信息更新.sql

@@ -15,7 +15,9 @@ SET
     confirm_options=$confirm_options$,
     amountpay=$amountpay$,
     required=$required$,
-    signature=$signature$
+    signature=$signature$,
+    questionedit=$questionedit$,
+    questionoption=$questionoption$
 WHERE sa_workpresetid = $sa_workpresetid$ and siteid=$siteid$
 
 

src/custom/restcontroller/webmanage/sale/workorder/workpreset.java

@@ -48,6 +48,8 @@ public class workpreset extends Controller{
 		Long amountpay = content.getLongValue("amountpay");
 		Long required = content.getLongValue("required");
 		Long signature = content.getLongValue("signature");
+		Long questionedit = content.getLongValue("questionedit");
+		String questionoption = content.getStringValue("questionoption");
 		JSONArray confirm_options =content.getJSONArray("confirm_options");
 		SQLFactory sqlFactory = new SQLFactory(this, "服务工单工作预设信息新增");
 
@@ -77,7 +79,10 @@ public class workpreset extends Controller{
 		sqlFactory.addParameter("confirm", confirm);
 		sqlFactory.addParameter("amountpay", amountpay);
 		sqlFactory.addParameter("required", required);
-		sqlFactory.addParameter("signature", signature);	
+		sqlFactory.addParameter("signature", signature);
+		sqlFactory.addParameter("questionedit", questionedit);
+		sqlFactory.addParameter("questionoption", questionoption);
+
 		sqlFactory.addParameter("confirm_options", confirm_options.toJSONString());
 		sqlList.add(sqlFactory.getSQL());
 		dbConnect.runSqlUpdate(sqlList);