送修单金额不显示bug修复

src/custom/restcontroller/webmanage/sale/customer/Customer.java

@@ -982,6 +982,7 @@ public class Customer extends Controller {
             if (whereObject.containsKey("sys_enterpriseid") && !"".equals(whereObject.getString("sys_enterpriseid"))) {
                 where.append(" and(");
                 where.append("t2.sys_enterpriseid ='").append(whereObject.getString("sys_enterpriseid")).append("' ");
+                where.append(" or t4.sys_enterpriseid ='").append(whereObject.getString("sys_enterpriseid")).append("' ");
                 where.append(")");
             }
         }

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

@@ -109,11 +109,12 @@ public class sendrepair extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair_detail", "t4", "t1.sa_sendrepairid = t4.sa_sendrepairid AND t1.siteid = t4.siteid","newspec","newitemno","newitemname",
-                "newitemid","newsku","agentcost","practicalamount","amount","logisticscost","logistics","idearemarks","disposition","demand","reason","duty",
+                "newitemid","newsku","agentcost","practicalamount","logisticscost","logistics","idearemarks","disposition","demand","reason","duty",
                 "stockdate","enddate","phonenumber","name","qty","itemid","sku","price");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t5", "t5.itemid = t4.itemid AND t5.siteid = t4.siteid","itemname","itemno","spec","model");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t5.unitid = t6.unitid AND t5.siteid = t6.siteid","unitname");
         querySQL.addQueryFields("remarksdetail","t4.remarks");
+        querySQL.addQueryFields("amountdetail","t4.amount");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.sa_sendrepairid",sa_sendrepairid);
         querySQL.setPage(pageSize, pageNumber);