Index: forgon-core/src/main/java/com/forgon/log/action/LogAction.java =================================================================== diff -u -r12331 -r15575 --- forgon-core/src/main/java/com/forgon/log/action/LogAction.java (.../LogAction.java) (revision 12331) +++ forgon-core/src/main/java/com/forgon/log/action/LogAction.java (.../LogAction.java) (revision 15575) @@ -2,6 +2,8 @@ import org.apache.commons.lang.StringUtils; +import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.directory.vo.LoginUserData; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.StrutsParamUtils; @@ -37,4 +39,12 @@ } return "success"; } + + public void saveLog(){ + LoginUserData loginUser = AcegiHelper.getLoginUser(); + String model = StrutsParamUtils.getPraramValue("model", ""); + String type = StrutsParamUtils.getPraramValue("type", ""); + String description = StrutsParamUtils.getPraramValue("description", ""); + appLogManager.saveLog(loginUser, model, type, description); + } } Index: ssts-web/src/main/resources/strtus_oa.xml =================================================================== diff -u -r15571 -r15575 --- ssts-web/src/main/resources/strtus_oa.xml (.../strtus_oa.xml) (revision 15571) +++ ssts-web/src/main/resources/strtus_oa.xml (.../strtus_oa.xml) (revision 15575) @@ -65,6 +65,7 @@ /log/logForm.jsp + Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r15479 -r15575 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 15479) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 15575) @@ -287,6 +287,8 @@ }); DWREngine.setAsync(true); + var description = ""; + for ( var i = 0, len = records.length; i < len; i++) { var tousseObj = {}; @@ -297,6 +299,11 @@ barcodeArray.push(barcode); tousseObj.barcodes = barcodeArray; + if(description != ""){ + description += ","; + } + description += barcode; + var virtualSeqNums = new Array(); var virtualBasketSeqNum = records[i].data['virtualBasketSeqNum']; virtualSeqNums.push(virtualBasketSeqNum); @@ -446,6 +453,14 @@ } } + //重新打印加日志记录 + top.Ext4.Ajax.request({ + url : WWWROOT + '/log/saveLog.do', + params : {model : '装配模块',type : 'A',description : "重新打印标签条码:" + description}, + success : function(response, options) { + + } + }); hideMessageBox(true); }