Browse Source

财务管理-信用调整单列表增加搜索条件:经销商

eganwu 1 year ago
parent
commit
23867cb8d3
1 changed files with 4 additions and 3 deletions
  1. 4 3
      src/custom/restcontroller/sale/creditbill/creditbill.java

+ 4 - 3
src/custom/restcontroller/sale/creditbill/creditbill.java

@@ -26,7 +26,7 @@ public class creditbill extends Controller {
         // TODO Auto-generated constructor stub
     }
 
-    @API(title = "新建更新信用额度调整单", apiversion = R.ID20221008155003.v1.class,intervaltime = 200)
+    @API(title = "新建更新信用额度调整单", apiversion = R.ID20221008155003.v1.class, intervaltime = 200)
     @CACHEING_CLEAN(apiversions = {R.ID20221008155103.v1.class, R.ID20221008155203.v1.class})
     public String insertormodify_creditbill() throws YosException {
         Long sa_creditbillid = content.getLong("sa_creditbillid");
@@ -57,7 +57,7 @@ public class creditbill extends Controller {
         } else {
             Rows rowscount = dbConnect
                     .runSqlQuery("select status from sa_creditbill where sa_creditbillid=" + sa_creditbillid);
-            if (rowscount.isNotEmpty()){
+            if (rowscount.isNotEmpty()) {
                 if (!rowscount.get(0).getString("status").equals("新建")) {
                     return getErrReturnObject().setErrMsg("非新建状态的信用额度调整单无法更新").toString();
                 }
@@ -127,7 +127,8 @@ public class creditbill extends Controller {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
                 where = where + " and (t1.billno like'%" + whereObject.getString("condition")
-                        + "%' or t1.remarks like '%" + whereObject.getString("condition") + "%')";
+                        + "%' or t1.remarks like '%" + whereObject.getString("condition")
+                        + "%' or t5.enterprisename like '%" + whereObject.getString("condition") + "%')";
             }
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where = where + " and t1.status ='" + whereObject.getString("status") + "' ";