1
0

2 Коммиты f32cb312ff ... a9b62134a0

Автор SHA1 Сообщение Дата
  shenjingwei a9b62134a0 Merge remote-tracking branch 'origin/develop-test' into develop-test 4 дней назад
  shenjingwei f31b24c907 出入库单优化 4 дней назад
1 измененных файлов с 7 добавлено и 5 удалено
  1. 7 5
      src/custom/restcontroller/crm/agent/stock/stockbill.java

+ 7 - 5
src/custom/restcontroller/crm/agent/stock/stockbill.java

@@ -21,15 +21,14 @@ public class stockbill extends Controller {
             @Param(paramname = "type", fieldtype = FieldType.Varchar, remarks = "单据类型")
     })
     public String sys_enterprise_stockbill_querylist() throws YosException {
-        String type = content.getStringValue("type");
-
+        JSONArray types = content.getJSONArray("type");
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_stockbill", "*").setTableAlias("t1");
         querySQL.addJoinTable(QuerySQL.JOINTYPE.left, "sys_enterprise_stock", "t2", "t1.sys_enterprise_stockid=t2.sys_enterprise_stockid", "stockno", "stockname");
         querySQL.addJoinTable(QuerySQL.JOINTYPE.left, "sa_customers", "t3", "t1.sa_customersid=t3.sa_customersid", "name", "phonenumber", "community");
         querySQL.addJoinTable(QuerySQL.JOINTYPE.left, "sa_store", "t4", "t3.sa_storeid=t4.sa_storeid", "storeno", "storename");
         querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
-        if (!type.isBlank()) {
-            querySQL.setWhere("t1.type", type);
+        if (!types.isEmpty()) {
+            querySQL.setWhere("t1.type", types);
         }
         querySQL.setSiteid(siteid);
         querySQL.setPage(pageSize, pageNumber);
@@ -41,7 +40,10 @@ public class stockbill extends Controller {
             @Param(paramname = "sys_enterprise_stockbillid", fieldtype = FieldType.BigInt)})
     public String sys_enterprise_stockbill_queryMain() throws YosException {
         long sys_enterprise_stockbillid = content.getLongValue("sys_enterprise_stockbillid");
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_stockbill");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_stockbill", "*").setTableAlias("t1");
+        querySQL.addJoinTable(QuerySQL.JOINTYPE.left, "sys_enterprise_stock", "t2", "t1.sys_enterprise_stockid=t2.sys_enterprise_stockid", "stockno", "stockname");
+        querySQL.addJoinTable(QuerySQL.JOINTYPE.left, "sa_customers", "t3", "t1.sa_customersid=t3.sa_customersid", "name", "phonenumber", "community");
+        querySQL.addJoinTable(QuerySQL.JOINTYPE.left, "sa_store", "t4", "t3.sa_storeid=t4.sa_storeid", "storeno", "storename");
         querySQL.setSiteid(siteid);
         querySQL.setUniqueid(sys_enterprise_stockbillid);
         Rows rows = querySQL.query();