商品组管理 / 商品生成商品组的逻辑bug修复及支出凭证根据备注模糊搜索

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -147,6 +147,7 @@ public class cashbill extends Controller {
                         + "%' or t3.accountname like '%" + whereObject.getString("condition") + "%'"
                         + "  or t2.abbreviation like '%" + whereObject.getString("condition") + "%'"
                         + "  or t1.billno like '%" + whereObject.getString("condition") + "%'"
+                        + "  or t1.remarks like '%" + whereObject.getString("condition") + "%'"
                         + ")";
             }
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -82,7 +82,7 @@ public class Item extends Controller {
             }
                 if(content.getLongValue("sa_customschemeid")!=itemRows.get(0).getLong("sa_customschemeid")){
                     Rows rowsCount = dbConnect.runSqlQuery("select count(1) count,min(groupnum) groupnum from (select ifnull(t3.sa_customschemeid,0) count,t1.sa_itemgroupid,t1.groupnum,t1.siteid from sa_itemgroup t1 inner join sa_itemgroupmx t2 on t1.siteid=t2.siteid and t1.sa_itemgroupid=t2.sa_itemgroupid inner join plm_item t3 on t2.itemid=t3.itemid and t2.siteid=t3.siteid group by t1.sa_itemgroupid,t1.groupnum,t1.siteid,ifnull(t3.sa_customschemeid,0))t where t.siteid='"+siteid+"' and t.sa_itemgroupid in (select sa_itemgroupid from sa_itemgroupmx where itemid="+itemid+")");
-                    if(rowsCount.get(0).getLong("count")>1){
+                    if(rowsCount.get(0).getLong("count")>0){
                         return getErrReturnObject().setErrMsg("该商品存在与商品组"+rowsCount.get(0).getString("groupnum")+",请在商品组删除该商品后进行保存").toString();
                     }
                 }