Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js =================================================================== diff -u -r21777 -r21781 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js (.../expensiveGoodsGodownEntryForm.js) (revision 21777) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js (.../expensiveGoodsGodownEntryForm.js) (revision 21781) @@ -947,20 +947,84 @@ }); } },{ + text : '打印验收单' + hidden:saveButton || (commonEntry.isOpen() ? true:false), + handler: function(){ + form.form.submit({ + url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!printSomeExpensiveGoodsGodownEntryItem.do', + method : 'POST', + waitMsg : '正在保存数据，请稍候', + waitTitle : '提交表单', + success : function(form, action) { + if(!isUndefinedOrNullOrEmpty(action.result.errorMessage)){ + showResult(action.result.errorMessage); + return; + } + Ext.getCmp("formSubmitResult").setValue(formSubmitResultSucc); + expensiveGoodsGodownEntryWin.close(); + grid.dwrReload(); + //打印条码 + commonEntry.printBarcode(action.result.items,false); + + }, + failure : function(form, action) { + showResult(action.failureType); + Ext.getCmp("formSubmitResult").setValue(formSubmitResultFail); + } + }); + } + },{ text : '保存并打印新标签', hidden:saveButton || (commonEntry.isOpen() ? true:false), handler : function() { if(!form.getForm().isValid()){ showResult('请正确填写表单各值'); return false; } - var items = buildJSONStringFromStore(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore()); - top.Ext.getCmp("items").setValue(items); + var invoicePlanId = top.Ext.getCmp('invoicePlanId').getValue() + var supplierId = top.Ext.getCmp('supplierId').getValue() + var supplierName = top.Ext.getCmp('supplierName').getValue() + if(!invoicePlanId){ + showResult('请选择要绑定的申请单'); + return false; + } +// var name = top.Ext.getCmp('name1').getValue(); + var store = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore(); + var len = store.getCount(); + var items = []; + for (var i = 0; i < len; i++) { + var record = store.getAt(i); + items.push({ + id : record.data.id, + model : record.data.model, //型号 + modelId : record.data.modelId, //型号id + batchNumber : record.data.batchNumber,//批次 + manufacturerId : record.data.manufacturerId, + manufacturerName : record.data.manufacturerName, + expensiveGoodsId : record.data.expensiveGoodsId, + expensiveGoodsName : record.data.expensiveGoodsName, + certification : record.data.certification , + cost : record.data.cost, + expDate : record.data.expDate.format('Y-m-d'), + firstBodyCode : record.data.firstBodyCode, + secondBodyCode : record.data.secondBodyCode, + thirdBodyCode : record.data.thirdBodyCode, + supplierId : supplierId, + supplierName : supplierName, + invoicePlanId :invoicePlanId, + localID: record.data.localID + }); + } + // 设置表单参数json + setFormParams(form,['id','remark','time','warehouseName','warehouseID','supplierId','supplierName','invoicePlanId']); + top.Ext.getCmp("items").setValue(JSON.stringify(items)); // items为json数组字符串，不会为null - if(items == '[]'){ + if(items.length == 0||items == '[]'){ showResult('请正确填写表单各值'); return false; } +// var items = buildJSONStringFromStore(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore()); +// top.Ext.getCmp("items").setValue(items); form.form.submit({ url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!saveExpensiveGoodsGodownEntry.do', method : 'POST', @@ -1049,7 +1113,7 @@ showResult('请选择要绑定的申请单'); return false; } - var name = top.Ext.getCmp('name1').getValue(); +// var name = top.Ext.getCmp('name1').getValue(); var store = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore(); var len = store.getCount(); var items = []; @@ -1145,12 +1209,10 @@ expensiveGoodsStore.baseParams.supplierId = null; expensiveGoodsStore.load(); batchNumStore.baseParams.expensiveGoodsID = null; -// batchNumStore.load(); modelStore.baseParams.expensiveGoodsID = null; -// modelStore.load(); } } }); expensiveGoodsGodownEntryWin.show(); top.Ext.getCmp('name1').focus(false, 100); -} \ No newline at end of file +} Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java =================================================================== diff -u -r21777 -r21781 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java (.../ExpensiveGoodsGodownEntryAction.java) (revision 21777) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java (.../ExpensiveGoodsGodownEntryAction.java) (revision 21781) @@ -286,14 +286,17 @@ ExpensiveGoods expensiveGoods = (ExpensiveGoods)objectDao.getByProperty(ExpensiveGoods.class.getSimpleName(), "id", expensiveGoodsGodownEntryItem.getExpensiveGoodsId()); expensiveGoodsGodownEntryItemJson.put("id", expensiveGoodsGodownEntryItem.getId()); expensiveGoodsGodownEntryItemJson.put("manufacturerId", expensiveGoodsGodownEntryItem.getManufacturerId()); - expensiveGoodsGodownEntryItemJson.put("manufacturer", expensiveGoodsGodownEntryItem.getManufacturerName()); + expensiveGoodsGodownEntryItemJson.put("manufacturerName", expensiveGoodsGodownEntryItem.getManufacturerName()); expensiveGoodsGodownEntryItemJson.put("expensiveGoodsId", expensiveGoodsGodownEntryItem.getExpensiveGoodsId()); expensiveGoodsGodownEntryItemJson.put("expensiveGoodsName", expensiveGoods.getShowName()); expensiveGoodsGodownEntryItemJson.put("certification", expensiveGoodsGodownEntryItem.getCertification()); expensiveGoodsGodownEntryItemJson.put("firstBodyCode", expensiveGoodsGodownEntryItem.getFirstBodyCode()); expensiveGoodsGodownEntryItemJson.put("secondBodyCode", expensiveGoodsGodownEntryItem.getSecondBodyCode()); expensiveGoodsGodownEntryItemJson.put("thirdBodyCode", expensiveGoodsGodownEntryItem.getThirdBodyCode()); expensiveGoodsGodownEntryItemJson.put("grade", expensiveGoodsGodownEntryItem.getGrade()); + expensiveGoodsGodownEntryItemJson.put("invoicePlanId", expensiveGoodsGodownEntryItem.getInvoicePlanId()); + expensiveGoodsGodownEntryItemJson.put("supplierId", expensiveGoodsGodownEntryItem.getSupplierId()); + expensiveGoodsGodownEntryItemJson.put("supplierName", expensiveGoodsGodownEntryItem.getSupplierName()); //鼠标移动需要用到的属性 expensiveGoodsGodownEntryItemJson.put("name", expensiveGoods.getName()); @@ -784,5 +787,13 @@ } } + //打印验收单 + public void printSomeExpensiveGoodsGodownEntryCheck() { + String items = StrutsParamUtils.getPraramValue("items", ""); + JSONObject jsonObj = new JSONObject(); + expensiveGoodsGodownEntryManager.printSomeGodownEntryItem(items, jsonObj); + StrutsResponseUtils.output(jsonObj); + } + } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js =================================================================== diff -u -r21777 -r21781 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js (.../expensiveGoodsGodownEntryView.js) (revision 21777) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js (.../expensiveGoodsGodownEntryView.js) (revision 21781) @@ -930,7 +930,7 @@ content +="" +" " + itemsList[i].name+ (b == false?"":" ["+specification+"]") +""+ cost - +"" + (itemsList[i].supplierName == ""?' ':itemsList[i].supplierName) + +"" + (itemsList[i].manufacturerName == ""?' ':itemsList[i].manufacturerName) +"" + new Date(itemsList[i].expDate.time).Format("yyyy-MM-dd"); +""+""; } @@ -939,7 +939,7 @@ tableContent = ("" +"" +"" - +"" + +"" +""); tableContent +="" + content + "

物品名称

单价

供应商

生产厂家

失效时间


"; record.set("htmlContent",tableContent);