Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js =================================================================== diff -u -r15482 -r15597 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 15482) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 15597) @@ -186,6 +186,10 @@ var personInCharge = top.Ext.getCmp('personInCharge').getValue(); var personInChargeCode = top.Ext.getCmp('personInChargeCode').getValue(); + + personInCharge = array[4] ? array[4] : personInCharge; //(cjr) + personInChargeCode = array[5] ? array[5] : personInChargeCode; + var position = top.Ext.getCmp('position').getValue(); var basket = new top.Ext.tree.TreeNode({ id : array[0], Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java =================================================================== diff -u -r14910 -r15597 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 14910) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 15597) @@ -40,6 +40,7 @@ import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.string.StringTools; /** * @author ZhouJie @@ -991,9 +992,21 @@ contentStr += "$"; } - String basketStr = classifyBasket.getId() + "," - + classifyBasket.getContainerName() + "," + totalGoodsAmount + "," - + classifyBasket.getContainerBarcode(); // 扫描的篮筐 + String personInCharge = classifyBasket.getPersonInCharge(); //把此篮筐的责任人也带给前台,如果是第一次清洗则用空字符串代替(cjr) + String personInChargeCode = classifyBasket.getPersonInChargeCode(); + + String personInChargeAndCode = ""; + if (StringTools.isNotBlank(personInCharge) && StringTools.isNotBlank(personInChargeCode)) { + personInChargeAndCode += ","+personInCharge+","+personInChargeCode; + } + + String basketStr = + classifyBasket.getId() + "," + + classifyBasket.getContainerName() + "," + + totalGoodsAmount + "," + + classifyBasket.getContainerBarcode() + + personInChargeAndCode + ; // 扫描的篮筐 contentStr = basketStr + contentStr; contentStr = contentStr.substring(0, contentStr.length() - 1); } catch (Exception e) {