Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java =================================================================== diff -u -r19830 -r25750 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java (.../IDCardDefinitionAction.java) (revision 19830) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java (.../IDCardDefinitionAction.java) (revision 25750) @@ -15,6 +15,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.idcarddefinition.IDCardDefinition; +import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.idcarddefinition.service.IDCardDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.serialnumber.model.SerialNum; @@ -293,6 +294,34 @@ } } + + /** + * 修改器械包标识牌定义的包装类型 + */ + public void updatePackageTypeOfIDCardDefinition(){ + + String idCardDefinitionID = StrutsParamUtils.getPraramValue("id", ""); + String packageType = StrutsParamUtils.getPraramValue("packageType", ""); + + StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); + String errMsg = ""; + JsonObject json = new JsonObject(); + try { + + idCardDefinitionManager.updatePackageTypeOfIDCardDefinition_TRANS_REQUIRED(idCardDefinitionID, packageType); + + } catch (Exception e) { + e.printStackTrace(); + errMsg = e.getMessage(); + } + json.addProperty("errMsg", errMsg); + try { + StrutsParamUtils.getResponse().getWriter().println(json.toString()); + } catch (IOException e) { + e.printStackTrace(); + } + } + public void saveTraceableMaterials() { String idCardDefinitionId = StrutsParamUtils.getPraramValue("idCardDefinitionId", ""); String originalTraceableMaterialsStr = StrutsParamUtils.getPraramValue( Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java =================================================================== diff -u -r25749 -r25750 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 25749) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 25750) @@ -754,12 +754,25 @@ } + /** + * 保存器械包标识牌 + */ @Override - // 保存器械包标识牌 public void updateIDCardDefinitions_TRANS_REQUIRED(String idCardDefinitionStr) { updateIDCardDefinitions_internal(idCardDefinitionStr); } + @Override + public void updatePackageTypeOfIDCardDefinition_TRANS_REQUIRED(String idCardDefinitionId, String packageType) { + IDCardDefinition curIDCardDefinition = getForUpdate(idCardDefinitionId); + if (curIDCardDefinition == null) { + throw new RuntimeException("标识牌已被删除!"); + } + curIDCardDefinition.setPackageType(packageType); + objectDao.update(curIDCardDefinition); + } + + @Override public void saveTraceableMaterials_TRANS_REQUIRED(String idCardDefinitionId,String originalTraceableMaterialsStr,String traceableMaterialsStr){ IDCardDefinition curIDCardDefinition = getForUpdate(idCardDefinitionId); if (curIDCardDefinition == null) { Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java =================================================================== diff -u -r25749 -r25750 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java (.../IDCardDefinitionManager.java) (revision 25749) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java (.../IDCardDefinitionManager.java) (revision 25750) @@ -49,6 +49,13 @@ String toIDCardDefinitionID); public void updateIDCardDefinitions_TRANS_REQUIRED(String idCardDefinitionStr); + /** + * 修改标识牌定义的包装类型 + * @param idCardDefinitionId 标识牌定义的id + * @param packageType 包装类型 + */ + public void updatePackageTypeOfIDCardDefinition_TRANS_REQUIRED(String idCardDefinitionId, String packageType); + public void saveTraceableMaterials_TRANS_REQUIRED(String idCardDefinitionId,String originalTraceableMaterialsStr,String traceableMaterialsStr); public void newAndSaveContainer(IDCardDefinition idCardDefinition); public Container newContainer(IDCardDefinition idCardDefinition);