Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r19889 -r19894 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 19889) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 19894) @@ -116,10 +116,8 @@ String[] idsArr = ids.split(";"); for (String id : idsArr) { if (StringUtils.isNotBlank(id)) { - ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager - .getById(id); - foreignTousseApplicationManager - .delete(foreignTousseApplication); + ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.get(id); + foreignTousseApplicationManager.delete(foreignTousseApplication); } } } @@ -143,7 +141,7 @@ JSONArray jsonArray = new JSONArray(); ForeignTousseApplication app = null; if(StringUtils.isNotBlank(applicationId)){ - app = foreignTousseApplicationManager.getById(applicationId); + app = foreignTousseApplicationManager.get(applicationId); if(app != null){ boolean confirmRecycle = false; if(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE.equals(app.getRecyclingStatus())){ @@ -165,7 +163,7 @@ String applicationId = StrutsParamUtils.getPraramValue("applicationId", null); ForeignTousseApplication app = null; if(StringUtils.isNotBlank(applicationId)){ - app = foreignTousseApplicationManager.getById(applicationId); + app = foreignTousseApplicationManager.get(applicationId); } String tousseBarcode = StrutsParamUtils.getPraramValue("tousseBarcode", null); JSONArray jsonArray = new JSONArray(); @@ -451,7 +449,7 @@ String id = StrutsParamUtils.getPraramValue("id", ""); if (StringUtils.isNotBlank(id) && !"0".equals(id)) { foreignTousseApplication = foreignTousseApplicationManager - .getById(id); + .get(id); } else { foreignTousseApplication = new ForeignTousseApplication(); foreignTousseApplication Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java =================================================================== diff -u -r19509 -r19894 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java (.../TestPDAForeignTousseGoodsInvoiceManager.java) (revision 19509) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java (.../TestPDAForeignTousseGoodsInvoiceManager.java) (revision 19894) @@ -2,7 +2,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; import java.util.ArrayList; import java.util.Date; @@ -22,7 +21,6 @@ import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; -import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; public class TestPDAForeignTousseGoodsInvoiceManager extends AbstractCSSDTest { @@ -132,7 +130,7 @@ //断言发货单不为空 assertNotNull(invoice); //外来器械申请单 - ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.getById(invoice.getInvoicePlan().getId().toString()); + ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.get(invoice.getInvoicePlan().getId()); //代理灭菌的发货单 Invoice invoice2 = (Invoice)objectDao.getByProperty(Invoice.class.getSimpleName(), "invoicePlan.serialNumber", "2014101700002"); //断言代理灭菌发货单为空 @@ -210,7 +208,7 @@ //断言发货单不为空 assertNotNull(invoice); //外来器械申请单 - ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.getById(invoice.getInvoicePlan().getId().toString()); + ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.get(invoice.getInvoicePlan().getId()); //断言发货单关联的包实例为3个 @@ -267,7 +265,7 @@ //断言发货单不为空 assertNotNull(invoice); //外来器械申请单 - ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.getById(invoice.getInvoicePlan().getId().toString()); + ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.get(invoice.getInvoicePlan().getId()); //断言发货单关联的包实例为1个 @@ -309,7 +307,7 @@ //断言发货单不为空 assertNotNull(invoice); //外来器械申请单 - ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.getById(invoice.getInvoicePlan().getId().toString()); + ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.get(invoice.getInvoicePlan().getId()); //断言发货单关联的包实例为1个 @@ -351,7 +349,7 @@ //断言发货单不为空 assertNotNull(invoice); //外来器械申请单 - ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.getById(invoice.getInvoicePlan().getId().toString()); + ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.get(invoice.getInvoicePlan().getId()); //断言发货单关联的包实例为1个 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java =================================================================== diff -u -r19885 -r19894 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java (.../ForeignTousseApplicationManager.java) (revision 19885) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java (.../ForeignTousseApplicationManager.java) (revision 19894) @@ -7,31 +7,20 @@ import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; -import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.tools.hibernate.BasePoManager; /** * @author panhaowen * * 2012-4-23 下午04:50:26 */ -public interface ForeignTousseApplicationManager { +public interface ForeignTousseApplicationManager extends BasePoManager { public void saveOrUpdate(ForeignTousseApplication foreignTousseApplication); - public void delete(ForeignTousseApplication foreignTousseApplication); - - public ForeignTousseApplication getById(String id); - public JSONObject getMiscInfoById(String id); /** - * 根据id获取TousseItem. - * @param id - * @return - */ - public TousseItem getForeignTousseItemById(String id); - - /** * 保存外来器械包申请单 * @param foreignTousseApplication 外来器械包申请单 * @param foreignTousseTreeData 外来器械包的一些数据 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r19889 -r19894 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 19889) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 19894) @@ -27,7 +27,6 @@ import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; import com.forgon.disinfectsystem.common.CssdUtils; -import com.forgon.disinfectsystem.entity.basedatamanager.foreigntoussedefinition.ForeignTousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; @@ -45,6 +44,7 @@ import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; +import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.security.service.AclTools; @@ -53,7 +53,7 @@ import com.forgon.tools.GB2Alpha; import com.forgon.tools.GB2WB; import com.forgon.tools.db.DatabaseUtil; -import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.json.JSONUtil; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.SqlUtils; @@ -63,11 +63,9 @@ * * 2012-4-23 下午04:54:00 */ -public class ForeignTousseApplicationManagerImpl implements +public class ForeignTousseApplicationManagerImpl extends BasePoManagerImpl implements ForeignTousseApplicationManager { - private ObjectDao objectDao; - private OrgUnitManager orgUnitManager; private TousseDefinitionManager tousseDefinitionManager; @@ -92,6 +90,8 @@ private LogManager appLogManager; + private TousseItemManager tousseItemManager; + public void setMaterialDefinitionManager( MaterialDefinitionManager materialDefinitionManager) { this.materialDefinitionManager = materialDefinitionManager; @@ -101,6 +101,10 @@ this.appLogManager = appLogManager; } + public void setTousseItemManager(TousseItemManager tousseItemManager) { + this.tousseItemManager = tousseItemManager; + } + public void setInvoicePlanManager(InvoicePlanManager invoicePlanManager) { this.invoicePlanManager = invoicePlanManager; } @@ -143,25 +147,6 @@ public void setOrgUnitManager(OrgUnitManager orgUnitManager) { this.orgUnitManager = orgUnitManager; } - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - @Override - public void delete(ForeignTousseApplication foreignTousseApplication) { - objectDao.delete(foreignTousseApplication); - } - - @Override - public ForeignTousseApplication getById(String id) { - if(StringUtils.isNotBlank(id)){ - return (ForeignTousseApplication) objectDao.getByProperty( - ForeignTousseApplication.class.getSimpleName(), "id", - Long.valueOf(id)); - } - return null; - } /** * 获取外来器械申请单的各种信息，包含病人姓名、住院号、诊疗号、器械包拆包数量、器械包的总件数等信息 @@ -171,7 +156,7 @@ public JSONObject getMiscInfoById(String id){ JSONObject obj = new JSONObject(); - ForeignTousseApplication app = getById(id); + ForeignTousseApplication app = get(id); String clinicNumber = StringTools.defaultString(app .getClinicNumber()); String hospitalNumber = StringTools.defaultString(app.getHospitalNumber()); @@ -333,7 +318,8 @@ String tousseItemId = obj.optString("tousseItemId"); TousseItem tousseItem = null; if(DatabaseUtil.isPoIdValid(tousseItemId)){ - tousseItem = getForeignTousseItemById(tousseItemId); + + tousseItem = tousseItemManager.get(tousseItemId); }else{ tousseItem = new TousseItem(); } @@ -716,12 +702,6 @@ return md; } - @Override - public TousseItem getForeignTousseItemById(String id) { - return (TousseItem) objectDao.getByProperty( - TousseItem.class.getSimpleName(), "id", Long.valueOf(id)); - } - @SuppressWarnings("unchecked") @Override public List findForeignTousseApplication( @@ -836,6 +816,7 @@ return JSONUtil.buildJsonObject(success, message); } + @Override public void comfirmReturnOrEarlyReturn(List ids, String returnType) { if (CollectionUtils.isNotEmpty(ids) && (ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN.equals(returnType) Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r19889 -r19894 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 19889) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 19894) @@ -5,7 +5,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -101,6 +100,7 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseMaterialErrorDamageManager; +import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager; import com.forgon.security.model.User; import com.forgon.tools.MathTools; import com.forgon.tools.SqlBuilder; @@ -112,6 +112,7 @@ import com.forgon.tools.json.JsonIncludePropertyFilter; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; +import com.forgon.tools.util.ForgonDateUtils; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; @@ -185,7 +186,12 @@ private SqlFunctionsAdapter sqlFunctionsAdapter; private ContainerManager containerManager; private MaterialInstanceManager materialInstanceManager; - + private TousseItemManager tousseItemManager; + + public void setTousseItemManager(TousseItemManager tousseItemManager) { + this.tousseItemManager = tousseItemManager; + } + public void setMaterialInstanceManager( MaterialInstanceManager materialInstanceManager) { this.materialInstanceManager = materialInstanceManager; @@ -2538,9 +2544,9 @@ public void loadForeignTousseItems(){ String applicationId = StrutsParamUtils.getPraramValue("applicationId", null); String recyclingrecordId = StrutsParamUtils.getPraramValue("recyclingrecordId", null); + Long tousseDefinitionId = StrutsParamUtils.getPraramLongValue("tousseDefinitionId", null); JSONArray jsonArray = new JSONArray(); if(StringUtils.isBlank(applicationId)){ - String tousseDefinitionId = StrutsParamUtils.getPraramValue("tousseDefinitionId", null); TousseDefinition td = tousseDefinitionManager.get(tousseDefinitionId); if(td != null){ Long app_id = td.getInvoicePlanID(); @@ -2549,15 +2555,16 @@ } } } - ForeignTousseApplication app = null; + InvoicePlan app = null; if(StringUtils.isNotBlank(applicationId)){ - app = foreignTousseApplicationManager.getById(applicationId); + app = invoicePlanManager.get(applicationId); if(app != null){ boolean confirmRecycle = false; if(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE.equals(app.getRecyclingStatus())){ confirmRecycle = true; } - jsonArray = buildTousseItemsJson(app.getApplicationItems(),confirmRecycle,jsonArray); + TousseItem tousseItem = tousseItemManager.find(app.getApplicationItems(), tousseDefinitionId); + jsonArray = buildTousseItemsJson(tousseItem,confirmRecycle,jsonArray); } } //是否外来器械接收单 @@ -2570,18 +2577,43 @@ } JSONObject obj = new JSONObject(); if(app != null){ - obj.put("hospitalNumber", getShowValue(app.getHospitalNumber())); - obj.put("clinicNumber", getShowValue(app.getClinicNumber())); - obj.put("patient", getShowValue(app.getPatient())); - obj.put("patientArea", getShowValue(app.getPatientArea())); - obj.put("ascriptionDepartment", getShowValue(app.getAscriptionDepartment())); - obj.put("surgery", getShowValue(app.getSurgery())); - String operationTime = ""; - if(app.getOperationTime() != null){ - operationTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(app.getOperationTime()); + Date operationTime = null; + String hospitalNumber = null,clinicNumber = null,patient = null,patientArea = null; + String doctor = null,surgery = null,ascriptionDepartment = null; + + if(app instanceof ForeignTousseApplication){ + ForeignTousseApplication fapp = (ForeignTousseApplication)app; + hospitalNumber = fapp.getHospitalNumber(); + clinicNumber = fapp.getClinicNumber(); + patient = fapp.getPatient(); + patientArea = fapp.getPatientArea(); + ascriptionDepartment = fapp.getAscriptionDepartment(); + surgery = fapp.getSurgery(); + operationTime = fapp.getOperationTime(); + doctor = fapp.getDoctor(); + }else if(app instanceof RecyclingApplication){ + RecyclingApplication rapp = (RecyclingApplication)app; + UseRecord useRecord = rapp.getUseRecord(); + if(useRecord != null){ + hospitalNumber = useRecord.getHospitalNum(); + clinicNumber = useRecord.getTreatmentNum(); + patient = useRecord.getPatientName(); + patientArea = useRecord.getPatientArea(); + ascriptionDepartment = ""; + surgery = useRecord.getOperation(); + operationTime = useRecord.getOperationTime(); + doctor = useRecord.getDoctorName(); + } + } - obj.put("operationTime", operationTime); - obj.put("doctor", getShowValue(app.getDoctor())); + obj.put("hospitalNumber", getShowValue(hospitalNumber)); + obj.put("clinicNumber", getShowValue(clinicNumber)); + obj.put("patient", getShowValue(patient)); + obj.put("patientArea", getShowValue(patientArea)); + obj.put("ascriptionDepartment", getShowValue(ascriptionDepartment)); + obj.put("surgery", getShowValue(surgery)); + obj.put("operationTime", ForgonDateUtils.safelyFormatDate(operationTime, Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + obj.put("doctor", getShowValue(doctor)); obj.put("remark", getShowValue(app.getRemark())); obj.put("recyclingStatus", app.getRecyclingStatus()); obj.put("isForeignTousseReceiveRecord", isForeignTousseReceiveRecord); @@ -2592,68 +2624,66 @@ } - private JSONArray buildTousseItemsJson(List tousseItems,boolean confirmRecycle,JSONArray jsonArray) { - if(tousseItems != null){ - for (TousseItem tousseItem : tousseItems) { - String tousseName = tousseItem.getTousseName(); - TousseDefinition td = tousseDefinitionManager.getForeignTousseDefinitionByTousseItem(tousseItem); - if(td != null){ - JSONObject jsonobj = new JSONObject(); - jsonobj.put("id", tousseItem.getId()); - jsonobj.put("tousseName", tousseName); - jsonobj.put("tousseDefinitionId", td.getId()); - jsonobj.put("supplierName", tousseItem.getSupplierName()); - jsonobj.put("amount", tousseItem.getAmount()); - jsonobj.put("includeImplant", ""); - jsonobj.put("price", td.getPrice() == null ? 0 : td.getPrice()); - jsonobj.put("type", "tousse"); - jsonobj.put("uiProvider", "col"); - jsonobj.put("cls", "master-task"); - jsonobj.put("iconCls", "task-folder"); - jsonobj.put("expanded", true); - JSONArray children = new JSONArray(); - - List fmd = td.getMaterialInstances(); - if (fmd != null) { - for (int i = 0; i < fmd.size(); i++) { - MaterialInstance mi = fmd.get(i); - String usedAmountOfIncludeImplantStr = ""; - String implantAmountOfUseRecord = ""; - String includeImplant = mi.materialIsImplant(); - //如果是植入物 - if ("是".equals(includeImplant)) { - if(mi.getUsedAmountOfIncludeImplant() != null){ - usedAmountOfIncludeImplantStr = "" + mi.getUsedAmountOfIncludeImplant(); - } - if(mi.getImplantAmountOfUseRecord() != null){ - implantAmountOfUseRecord = "" + mi.getImplantAmountOfUseRecord(); - }else{ - implantAmountOfUseRecord = "0"; - } - - if(confirmRecycle && StringUtils.isBlank(usedAmountOfIncludeImplantStr)){ - usedAmountOfIncludeImplantStr = implantAmountOfUseRecord; - } + private JSONArray buildTousseItemsJson(TousseItem tousseItem,boolean confirmRecycle,JSONArray jsonArray) { + if(tousseItem != null){ + String tousseName = tousseItem.getTousseName(); + TousseDefinition td = tousseDefinitionManager.getForeignTousseDefinitionByTousseItem(tousseItem); + if(td != null){ + JSONObject jsonobj = new JSONObject(); + jsonobj.put("id", tousseItem.getId()); + jsonobj.put("tousseName", tousseName); + jsonobj.put("tousseDefinitionId", td.getId()); + jsonobj.put("supplierName", tousseItem.getSupplierName()); + jsonobj.put("amount", tousseItem.getAmount()); + jsonobj.put("includeImplant", ""); + jsonobj.put("price", td.getPrice() == null ? 0 : td.getPrice()); + jsonobj.put("type", "tousse"); + jsonobj.put("uiProvider", "col"); + jsonobj.put("cls", "master-task"); + jsonobj.put("iconCls", "task-folder"); + jsonobj.put("expanded", true); + JSONArray children = new JSONArray(); + + List fmd = td.getMaterialInstances(); + if (fmd != null) { + for (int i = 0; i < fmd.size(); i++) { + MaterialInstance mi = fmd.get(i); + String usedAmountOfIncludeImplantStr = ""; + String implantAmountOfUseRecord = ""; + String includeImplant = mi.materialIsImplant(); + //如果是植入物 + if ("是".equals(includeImplant)) { + if(mi.getUsedAmountOfIncludeImplant() != null){ + usedAmountOfIncludeImplantStr = "" + mi.getUsedAmountOfIncludeImplant(); } - JSONObject obj = new JSONObject(); - obj.put("id", mi.getId()); - obj.put("tousseName", mi.getMaterialName()); - obj.put("includeImplant", includeImplant); - obj.put("amount", mi.getCount()); - obj.put("recycleAmount", mi.getApplyAmount() == null ? "" : mi.getApplyAmount()); - obj.put("usedAmountOfIncludeImplant",usedAmountOfIncludeImplantStr); - obj.put("implantAmountOfUseRecord",implantAmountOfUseRecord); - obj.put("minDismantleAmount",mi.getMinDismantleAmount()); - obj.put("type", "material"); - obj.put("uiProvider", "col"); - obj.put("leaf", true); - obj.put("iconCls", "task"); - children.add(obj); + if(mi.getImplantAmountOfUseRecord() != null){ + implantAmountOfUseRecord = "" + mi.getImplantAmountOfUseRecord(); + }else{ + implantAmountOfUseRecord = "0"; + } + + if(confirmRecycle && StringUtils.isBlank(usedAmountOfIncludeImplantStr)){ + usedAmountOfIncludeImplantStr = implantAmountOfUseRecord; + } } + JSONObject obj = new JSONObject(); + obj.put("id", mi.getId()); + obj.put("tousseName", mi.getMaterialName()); + obj.put("includeImplant", includeImplant); + obj.put("amount", mi.getCount()); + obj.put("recycleAmount", mi.getApplyAmount() == null ? "" : mi.getApplyAmount()); + obj.put("usedAmountOfIncludeImplant",usedAmountOfIncludeImplantStr); + obj.put("implantAmountOfUseRecord",implantAmountOfUseRecord); + obj.put("minDismantleAmount",mi.getMinDismantleAmount()); + obj.put("type", "material"); + obj.put("uiProvider", "col"); + obj.put("leaf", true); + obj.put("iconCls", "task"); + children.add(obj); } - jsonobj.put("children", children); - jsonArray.add(jsonobj); } + jsonobj.put("children", children); + jsonArray.add(jsonobj); } } return jsonArray; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java =================================================================== diff -u -r19789 -r19894 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 19789) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 19894) @@ -5,12 +5,11 @@ import java.util.List; import java.util.Map; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; -import net.sf.json.JSONArray; - import com.forgon.component.grid.GridManager; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; @@ -159,7 +158,7 @@ //是否禁用“提前归还”按钮 boolean disableEarlyReturn = false; if (DatabaseUtil.isPoIdValid(id)) { - ForeignTousseApplication ftApplication = foreignTousseApplicationManager.getById(id); + ForeignTousseApplication ftApplication = foreignTousseApplicationManager.get(id); if (ftApplication != null && InvoicePlan.RECYCLINGSTATUS_RECYCLED.equals(ftApplication.getRecyclingStatus()) && !ForeignTousseApplication.APPLICATION_STATUS_RETRUN.equals(ftApplication.getPackageStatus())) { @@ -196,8 +195,7 @@ public void updateForeignTousseApplicationStatus(String id, String barcode) { if (StringUtils.isNotBlank(id)) { - ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager - .getById(id); + ForeignTousseApplication foreignTousseApplication = foreignTousseApplicationManager.get(id); if (foreignTousseApplication != null) { foreignTousseApplication.setIsPacking(1); foreignTousseApplicationManager @@ -212,7 +210,7 @@ TousseInstance tousseInstance = tousseInstanceManager .getTousseInstanceByBarcode(barcode); ForeignTousseApplication tousseApp = foreignTousseApplicationManager - .getById(String.valueOf(tousseInstance.getForeignTousseApp_id())); + .get(tousseInstance.getForeignTousseApp_id()); if (tousseApp != null) { Long id = tousseApp.getId();