Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js =================================================================== diff -u -r14017 -r14067 --- ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js (.../printConfig.js) (revision 14017) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js (.../printConfig.js) (revision 14067) @@ -806,50 +806,49 @@ } +function printForeignProxyDisinfectionSmallLabel(obj){ + doGetLodop(); + // 划线 + if(obj.markTousse){ + LODOP.ADD_PRINT_LINE('5mm','0mm','5mm','50mm',0,1); + LODOP.ADD_PRINT_LINE('16mm','0mm','16mm','50mm',0,1); + } + // 设置默认字体 + setDefaultFontNameSizeBold('宋体',12,1); + // 默认条码属性 + LODOP.SET_PRINT_STYLE('ShowBarText', true); + LODOP.SET_PRINT_STYLE('FontSize', 6); + LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true); + + var fontSize = getFontSizeByStr(obj.name,[ + {maxLen:10,fontSize:10}, + {maxLen:20,fontSize:6}, + {maxLen:1000,fontSize:4} + ]); + LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","5mm", obj.name); + setFontSizeBold(fontSize,1);// 设置字体 + setAlignment('center');// 对齐 + + LODOP.ADD_PRINT_TEXT("6mm","1mm","34mm","6mm", "灭菌:"+obj.sterilizationDate); + setFontSizeBold(9,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("6mm","26mm","30mm","6mm", "灭菌员:"+obj.applicant); + setFontSizeBold(9,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("12mm","1mm","34mm","6mm", "失效:"+obj.validDate); + setFontSizeBold(9,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("12mm","26mm","30mm","6mm", "灭菌程序:"+obj.sterilingType); + setFontSizeBold(9,0);// 设置字体 + + LODOP.ADD_PRINT_TEXT("17mm","0mm","RightMargin:0mm","6mm", obj.depart); + setFontSizeBold(9,0);// 设置字体 + setAlignment('center');// 对齐 + + LODOP.ADD_PRINT_BARCODE("21mm","10mm","30mm","9mm","128Auto", obj.barcode);// 条码1 + + +} + var foreignProxyDisinfectionLabelConfig = { - // 可带表格线的table定义 - table : { - rules : 'rows', - style : 'width: 50mm; height: 30mm', - cellspacing : '0', - cellpadding : '0', - position : ["3mm","0mm","100%","100%"], - printMode : {mode : 'PRINT_PAGE_PERCENT', value : 'Full-Page'}, - beforeStr: "", afterStr: "", - rows : [ - // 每个表格行的定义 - {height : "", tds : [ - { label : "", dataIndex : 'name', colspan: 4, styles : [{minLen:0, maxLen:14, style: "font-size:12px;font-weight:bold;text-align:center"},{minLen :14, maxLen:100 ,style : "font-size:10px;text-align:center"}]} - ] - }, - {height : "", tds : [ - { label : "", dataIndex : 'depart', colspan: 4, style : "font-size:12px;text-align:center;height:5mm"} - ] - }, - {height : "", tds : [ - { label : "灭菌程序:", dataIndex : 'sterilingType', colspan: 2, style : "font-size:12px;text-align:center;height:4mm"}, - { label : "灭菌员:", dataIndex : 'applicant', colspan: 2, style : "font-size:12px;text-align:center;height:4mm"} - ] - }, - {height : "", tds : [ - { label : "灭菌:", dataIndex : 'sterilizationDate', colspan: 2, style : "font-size:11px; text-align:center;height:4mm;width:24mm"}, - { label : "失效:", dataIndex : 'validDate', colspan: 2, length: 10, style : "font-size:11px; text-align:center;height:4mm;width:24mm"} - ] - }, - {height : "", tds : [ - { label : "灭菌炉:", dataIndex : 'sterilizer', colspan: 4, style : "font-size:11px; text-align:center;height:4mm;width:24mm"} - ] - }, - {height : "", tds : [ - { label : "炉次:", dataIndex : 'frequency', colspan: 4, style : "font-size:11px; text-align:center;height:4mm;width:24mm"} - ] - }, - {height : "", tds : [ - { label : "", dataIndex : 'barcode', colspan: 4, style : "font-size:10px;text-align:center"} - ] - } - ] - } + customPrint : printForeignProxyDisinfectionSmallLabel } var foreignTousseAppliationPrintConfig = { Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r14036 -r14067 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 14036) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 14067) @@ -26,6 +26,24 @@ plugins: [this.cellEditing] }); this.superclass.initComponent.call(this); + }, + initComponent: function() { + this.cellEditing = new top.Ext4.grid.plugin.CellEditing({ + clicksToEdit: 1, + listeners: { + beforeedit: function(editor, context, eOpts){ + var record = context.record; + var isLeaf = record.get('leaf'); + if(!isLeaf && (context.colIdx == 2 || context.colIdx == 3 || context.colIdx == 4 || context.colIdx == 6 || context.colIdx == 7)){ + return false; + } + } + } + }); + Ext4.apply(this, { + plugins: [this.cellEditing] + }); + this.superclass.initComponent.call(this); } }); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r14023 -r14067 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14023) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14067) @@ -1575,9 +1575,10 @@ var validDate = tousse.validDate; var maker = tousse.maker; var assistant = tousse.assistant; + var markTousse = tousse.tousse; var printSummaryObj = {'barcode':barcode, 'name':name, 'applicant':applicant, 'depart': depart, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'material':material, 'sterilingType':sterilingType, - 'maker':maker,'assistant':assistant}; + 'maker':maker,'assistant':assistant,'markTousse':markTousse}; top.Ext4.applyIf(printSummaryObj,tousse); defaultForeignPrintPackage(printSummaryObj); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r14036 -r14067 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 14036) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 14067) @@ -2,37 +2,27 @@ import java.io.IOException; import java.io.PrintWriter; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; + import javax.servlet.http.HttpServletResponse; + import net.sf.json.JSONArray; import net.sf.json.JSONObject; + import org.apache.commons.lang.StringUtils; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; -import com.forgon.Constants; -import com.forgon.directory.acegi.tools.AcegiHelper; -import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager; -import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; -import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; + import com.forgon.disinfectsystem.entity.basedatamanager.foreigntoussedefinition.ForeignTousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; -import com.forgon.disinfectsystem.entity.becleanitem.BeCleanItem; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; -import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager; -import com.forgon.disinfectsystem.packing.service.PackingManager; import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.systemsetting.model.HttpOption; @@ -57,14 +47,8 @@ private ForeignTousseApplicationManager foreignTousseApplicationManager; - private BeCleanItemManager beCleanItemManager; - private TousseDefinitionManager tousseDefinitionManager; - private PackingManager packingManager; - - private ContainerManager containerManager; - private HttpOptionManager httpOptionManager; private MaterialInstanceManager materialInstanceManager; @@ -78,23 +62,11 @@ this.httpOptionManager = httpOptionManager; } - public void setContainerManager(ContainerManager containerManager) { - this.containerManager = containerManager; - } - - public void setPackingManager(PackingManager packingManager) { - this.packingManager = packingManager; - } - public void setTousseDefinitionManager( TousseDefinitionManager tousseDefinitionManager) { this.tousseDefinitionManager = tousseDefinitionManager; } - public void setBeCleanItemManager(BeCleanItemManager beCleanItemManager) { - this.beCleanItemManager = beCleanItemManager; - } - public void setForeignTousseApplicationManager( ForeignTousseApplicationManager foreignTousseApplicationManager) { this.foreignTousseApplicationManager = foreignTousseApplicationManager; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r14023 -r14067 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 14023) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 14067) @@ -42,6 +42,7 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection; import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.expirationdateinfo.service.ExpirationDateInfoManager; import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; @@ -83,6 +84,13 @@ private InvoicePlanManager invoicePlanManager; + private ExpirationDateInfoManager expirationDateInfoManager; + + public void setExpirationDateInfoManager( + ExpirationDateInfoManager expirationDateInfoManager) { + this.expirationDateInfoManager = expirationDateInfoManager; + } + public void setInvoicePlanManager(InvoicePlanManager invoicePlanManager) { this.invoicePlanManager = invoicePlanManager; } @@ -629,6 +637,11 @@ obj.put("sterilizationDate", TousseInstanceUtils.safelyGetSterileStartDateStr(tousseInstance)); obj.put("maker", foreignProxyDisinfection.getMaker()); obj.put("assistant", foreignProxyDisinfection.getAssistant()); + String validUntilStr = tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD);; + String sterileStartTime = tousseInstance.getSterileStartTime(); + boolean isMarkTousse = expirationDateInfoManager + .isMarkTousse(sterileStartTime, validUntilStr); + obj.put("markTousse",isMarkTousse); printParamList.add(obj); } return printParamList;