|
|
@@ -179,6 +179,11 @@ public class hospitaldepitem extends Controller {
|
|
|
where.append("t1.spec like'%").append(whereObject.getString("spec")).append("%' ");
|
|
|
where.append(")");
|
|
|
}
|
|
|
+ if (whereObject.containsKey("goodstype") && !"".equals(whereObject.getString("goodstype"))) {
|
|
|
+ where.append(" and(");
|
|
|
+ where.append("t1.goodstype like'%").append(whereObject.getString("goodstype")).append("%' ");
|
|
|
+ where.append(")");
|
|
|
+ }
|
|
|
if (whereObject.containsKey("itemclassid") && !"".equals(whereObject.getString("itemclassid"))) {
|
|
|
Long itemclassid = whereObject.getLong("itemclassid");
|
|
|
ArrayList<Long> itemclassids = ItemClass.getSubItemClassIds(this, itemclassid);
|
|
|
@@ -195,7 +200,7 @@ public class hospitaldepitem extends Controller {
|
|
|
Long sa_hospitaldepid = content.getLongValue("sa_hospitaldepid");
|
|
|
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "plm_item",
|
|
|
- "itemid", "itemno", "itemname", "model", "spec", "assistance", "goodstype", "explains")
|
|
|
+ "itemid", "itemno", "itemname", "model", "spec", "assistance", "goodstype", "explains","goodstype")
|
|
|
.setTableAlias("t1");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "plm_itemextend", "t2", "t2.itemid = t1.itemid AND t2.siteid = t1.siteid",
|
|
|
"erpitemname", "erpitemno");
|