Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r19435 -r19443 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19435) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19443) @@ -3637,7 +3637,7 @@ tousse.optString("tousseName"), tousse.optJSONObject("tousseDefinition"), arr, arrSeqNum, - tousseType, + TousseDefinition.PACKAGE_TYPE_SPLIT, tousse.optString("packingType"), packageTypeAbbreviation, sterilingType, Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js =================================================================== diff -u -r18933 -r19443 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 18933) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 19443) @@ -1,4 +1,4 @@ -var appropriationInListConfig = { +var appropriationInListConfig = { headerFooter : [ // 页眉名称 {label : "广东省人民医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, @@ -1321,41 +1321,49 @@ var foreignTousseSmallLabelConfig = { customPrint:printForeignTousseSmallLabel_gdsy } +// 50*30 function printForeignTousseSmallLabel_gdsy(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); + LODOP.ADD_PRINT_LINE('8mm','0mm','8mm','50mm',0,1); + LODOP.ADD_PRINT_LINE('19mm','0mm','19mm','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 nameTop = "1mm"; + var implantAmount = obj.implantAmount; var fontSize = getFontSizeByStr(obj.name,[ {maxLen:10,fontSize:10}, {maxLen:20,fontSize:8}, {maxLen:1000,fontSize:7} ]); - LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","5mm", obj.name); + if(obj.tousseType == '外来器械拆分小包' && !isUndefinedOrNull(implantAmount) && implantAmount > 0){ + LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","3mm", '植入物'); + setFontSizeBold(8,1);// 设置字体 + setAlignment('center');// 对齐 + } + LODOP.ADD_PRINT_TEXT("4mm","0mm","RightMargin:0mm","5mm", obj.name); setFontSizeBold(fontSize,1);// 设置字体 setAlignment('center');// 对齐 - LODOP.ADD_PRINT_TEXT("6mm","1mm","34mm","6mm", "灭菌:"+obj.sterilizationDate); + LODOP.ADD_PRINT_TEXT("9mm","1mm","34mm","6mm", "灭菌:"+obj.sterilizationDate); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("6mm","30mm","30mm","6mm", "装配:"+obj.operator); + LODOP.ADD_PRINT_TEXT("9mm","30mm","30mm","6mm", "装配:"+obj.operator); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("12mm","1mm","34mm","6mm", "失效:"+obj.validDate); + LODOP.ADD_PRINT_TEXT("15mm","1mm","34mm","6mm", "失效:"+obj.validDate); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("12mm","30mm","30mm","6mm", "审核:"+obj.reviewer); + LODOP.ADD_PRINT_TEXT("15mm","30mm","30mm","6mm", "审核:"+obj.reviewer); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_BARCODE("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1 + LODOP.ADD_PRINT_BARCODE("20mm","10mm","30mm","7mm","128Auto", obj.barcode);// 条码1 } //外来器械包中标签 var foreignTousseMiddleLableConfig = {