Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManager.java =================================================================== diff -u --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManager.java (revision 0) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManager.java (revision 12833) @@ -0,0 +1,15 @@ +package com.forgon.disinfectsystem.diposablegoods.service; + +import java.util.List; + +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; + +public interface DisposableGoodsBatchManager { + /** + * 根据一次性物品定义的id获取一次性物品批次定义 + * @param disposableGoodsId 一次性物品定义的id + * @param spell 包含的批次号分段 + * @return 一次性物品定义下的所有批次定义 + */ + public List getDisposableGoodsBatch(String disposableGoodsId,String spell); +} Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml =================================================================== diff -u -r12785 -r12833 --- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 12785) +++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 12833) @@ -894,7 +894,24 @@ + + + + + + + + + PROPAGATION_REQUIRED + + + + + + Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r12824 -r12833 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 12824) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 12833) @@ -23,6 +23,7 @@ import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; +import com.forgon.disinfectsystem.diposablegoods.service.DisposableGoodsBatchManager; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; @@ -54,6 +55,8 @@ private DiposableGoodBatchStockManager diposableGoodBatchStockManager; + private DisposableGoodsBatchManager disposableGoodsBatchManager; + private final Pattern pat = Pattern.compile("[\\u4E00-\\u9FA5]+"); public void setDiposableGoodBatchStockManager( @@ -74,6 +77,11 @@ this.httpOptionManager = httpOptionManager; } + public void setDisposableGoodsBatchManager( + DisposableGoodsBatchManager disposableGoodsBatchManager) { + this.disposableGoodsBatchManager = disposableGoodsBatchManager; + } + /** * 保存前检查是否重复 * @@ -545,6 +553,40 @@ } /** + * 获取一次性物品的批次定义 + * @return + */ + public String getDisposableGoodsBatchList(){ + String diposableGoodsID = StrutsParamUtils.getPraramValue("disposableGoodsID", ""); + String spelling = StrutsParamUtils.getPraramValue("spell", null); + if (StringUtils.isBlank(diposableGoodsID)) + return null; + try { + List disposableGoodsBatchList = disposableGoodsBatchManager + .getDisposableGoodsBatch(diposableGoodsID,spelling); + + JsonConfig jsonConfig = new JsonConfig(); + JsonPropertyFilter filter = new JsonPropertyFilter(new String[] { + "diposableGoods", "barcode", "type", "identifications" }); + jsonConfig.setJsonPropertyFilter(filter); + JSONArray jsonArray = JSONArray.fromObject(disposableGoodsBatchList, jsonConfig); + HttpServletResponse response = StrutsParamUtils.getResponse(); + response.setCharacterEncoding("UTF-8"); + PrintWriter out; + try { + out = response.getWriter(); + out.print(jsonArray.toString()); + out.close(); + } catch (IOException e) { + e.printStackTrace(); + } + + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + /** * 根据一次性物品Id返回该物品的所有入库批次号列表 * * @return Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManagerImpl.java =================================================================== diff -u --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManagerImpl.java (revision 0) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsBatchManagerImpl.java (revision 12833) @@ -0,0 +1,33 @@ +package com.forgon.disinfectsystem.diposablegoods.service; + +import java.util.List; + +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; +import com.forgon.tools.db.DatabaseUtil; +import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.string.StringTools; + + +public class DisposableGoodsBatchManagerImpl implements DisposableGoodsBatchManager { + private ObjectDao objectDao; + + public void setObjectDao(ObjectDao objectDao) { + this.objectDao = objectDao; + } + + @SuppressWarnings("unchecked") + @Override + public List getDisposableGoodsBatch(String disposableGoodsId,String spell) { + + if (DatabaseUtil.isPoIdValid(disposableGoodsId)) { + String sql = " where po.diposableGoods.id = " + disposableGoodsId; + if(!StringTools.isBlank(spell)){ + sql += " and po.batchNumber like %" + spell + "%"; + } + return objectDao.findBySql(DisposableGoodsBatch.class.getSimpleName(), sql); + } + return null; + + } + +} Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r12797 -r12833 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12797) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12833) @@ -109,7 +109,7 @@ batchNumStore = new top.Ext.data.Store({ proxy : new top.Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getBatchNumData.do', + url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDisposableGoodsBatchList.do', method : 'POST' }), reader : new top.Ext.data.JsonReader({