送修单表体单价新增及查询服务申请单列表新增按createuserid查询

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

@@ -448,6 +448,9 @@ public class serviceorder extends Controller {
             if (whereObject.containsKey("sa_customersid") && !"".equals(whereObject.getString("sa_customersid"))) {
                 where.append(" and t1.sa_customersid ='").append(whereObject.getString("sa_customersid")).append("'");
             }
+            if (whereObject.containsKey("createuserid") && !"".equals(whereObject.getString("createuserid"))) {
+                where.append(" and t1.createuserid ='").append(whereObject.getString("createuserid")).append("'");
+            }
 
             if(whereObject.getBooleanValue("todaysubmitCount")){
                 where.append(" and t1.status != '新建' and DATE(t1.submitdate) = CURDATE() ");

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

@@ -4,6 +4,7 @@ import beans.accountbalance.Accountbalance;
 import beans.accountbalance.CashbillEntity;
 import beans.data.BatchDeleteErr;
 import beans.datacontrllog.DataContrlLog;
+import beans.itemprice.ItemPrice;
 import beans.parameter.Parameter;
 import beans.report.Report;
 import beans.stockbill.Stockbill;
@@ -486,7 +487,8 @@ public class stockbill extends Controller {
             insertSQL.setDateValue("billdate");
             sqlList.add(insertSQL.getSQL());
             sqlList.add(DataContrlLog.createLog(this, "st_stockbill", row.getLong("st_stockbillid"), "转送修单",  "转送修单成功").getSQL());
-
+            ArrayList<Long> ids = rowsMapDetail.get(row.getString("st_stockbillid")).toArrayList("itemid", new ArrayList<>());
+            HashMap<Long, ItemPrice> itemPriceRowsMap = ItemPrice.getItemPrice(this, sys_enterpriseid, ids);
             for (Row rowdetail : rowsMapDetail.get(row.getString("st_stockbillid"))) {
                 insertSQL = SQLFactory.createInsertSQL(this, "sa_sendrepair_detail");
                 long sa_sendrepair_detailid = createTableID("sa_sendrepair_detail");
@@ -505,6 +507,13 @@ public class stockbill extends Controller {
                 insertSQL.setValue("qty", rowdetail.getBigDecimal("qty"));
                 insertSQL.setValue("sku", rowdetail.getString("sku"));
                 insertSQL.setValue("itemid", rowdetail.getString("itemid"));
+                if (itemPriceRowsMap.containsKey(rowdetail.getLong("itemid"))) {
+                    insertSQL.setValue("price", itemPriceRowsMap.get(rowdetail.getLong("itemid")).getPrice());
+                } else {
+                    insertSQL.setValue("price", 0);
+                }
+
+
                 sqlList.add(insertSQL.getSQL());
                 sqlList.add("update st_stockbill_items set isrepair=1 where st_stockbill_itemsid=" + rowdetail.getLong("st_stockbill_itemsid"));