Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java =================================================================== diff -u -r21849 -r21894 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java (.../ExpensiveGoodsGodownEntryAction.java) (revision 21849) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java (.../ExpensiveGoodsGodownEntryAction.java) (revision 21894) @@ -788,17 +788,17 @@ } //打印高值耗材入库单验收单 -// public void printReceivingReport() { -// try { -// String id = StrutsParamUtils.getPraramValue("id", ""); -// JSONObject jsonObject = new JSONObject(); -// expensiveGoodsGodownEntryManager.loadGodownEntryReceivingReportPrintData(id, jsonObject); -// jsonObject.put("success", true); -// StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); -// StrutsParamUtils.getResponse().getWriter().println(jsonObject.toString()); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } + public void printReceivingReport() { + try { + String id = StrutsParamUtils.getPraramValue("id", ""); + JSONObject jsonObject = new JSONObject(); + expensiveGoodsGodownEntryManager.loadGodownEntryReceivingReportPrintData(id, jsonObject); + jsonObject.put("success", true); + StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); + StrutsParamUtils.getResponse().getWriter().println(jsonObject.toString()); + } catch (Exception e) { + e.printStackTrace(); + } + } } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js =================================================================== diff -u -r21849 -r21894 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js (.../expensiveGoodsGodownEntryForm.js) (revision 21849) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js (.../expensiveGoodsGodownEntryForm.js) (revision 21894) @@ -427,6 +427,7 @@ // console.log(record.data); setSupplierInfo(record.data.id,record.data.name); top.Ext.getCmp('supplier1').setValue(record.data.id); + clearAddedElementValue();//清空 top.Ext.getCmp('name1').enable(); authorizedExpensiveGoodsStore.baseParams.supplierId = record.data.id; authorizedExpensiveGoodsStore.load(); @@ -954,13 +955,14 @@ } }); } - },/*{ + },{ text : '打印验收单', hidden:saveButton || (commonEntry.isOpen() ? false:true), handler: function(){ var id = top.Ext.getCmp('id').getValue(); commonEntry.onPrintReceivingReport(id); - },*/ + } + }, { text : '保存并打印新标签', hidden:saveButton || (commonEntry.isOpen() ? true:false), @@ -1102,7 +1104,7 @@ waitTitle : '预验收表单', params : {id:id}, success : function(form, action) { - console.log(action.result); +// console.log(action.result); if(action.result.success){ expensiveGoodsGodownEntryWin.close(); grid.dwrReload(); @@ -1126,7 +1128,7 @@ waitTitle : '验收表单', params : {id:id}, success : function(form, action) { - console.log(action.result); +// console.log(action.result); if(action.result.success){ expensiveGoodsGodownEntryWin.close(); grid.dwrReload(); @@ -1269,7 +1271,7 @@ function matchingInvoicePlan(expensiveGoodsId){ for(var i = 0;i < top.Ext.getCmp('invoicePlanDetailGrid').getStore().getCount();i++){ var invoicePlanDetailData = top.Ext.getCmp('invoicePlanDetailGrid').getStore().getAt(i).data; - if(invoicePlanDetailData.expensiveGoodsId == expensiveGoodsId){ + if(expensiveGoodsId == invoicePlanDetailData.expensiveGoodsId){ return true; } } @@ -1295,7 +1297,6 @@ } if(itemsAmountArray.length>0){ for (var i = 0; i < itemsAmountArray.length; i++) { -// debugger; if(!checkAmount(itemsAmountArray[i],iPAmountArray)){//若返回false：物品的入库数量小于申请单物品的申请数量 return false; } Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java =================================================================== diff -u -r21849 -r21894 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java (.../ExpensiveGoodsGodownEntryManager.java) (revision 21849) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java (.../ExpensiveGoodsGodownEntryManager.java) (revision 21894) @@ -83,5 +83,5 @@ /** * 获取打印验收单的信息 */ -// public void loadGodownEntryReceivingReportPrintData(String id,JSONObject jsonobject ); + public void loadGodownEntryReceivingReportPrintData(String id,JSONObject jsonobject ); } Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js =================================================================== diff -u -r21190 -r21894 --- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 21190) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 21894) @@ -1,4 +1,4 @@ -var appropriationInListConfig = { +var appropriationInListConfig = { headerFooter : [ // 页眉名称 {label : "广州市中心医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, @@ -631,6 +631,38 @@ ] } } + +var expensiveGoodsReceivingReportPrintConfig = { + headerFooter : [ + {label : "验收表", dataIndex : '', fontSize : 15, position : ["30","45%","99%",5]}, + {label : "供货单位:", dataIndex : 'supplierName', fontSize : 11, position : ["60","2%","90%",5]}, + //页脚 + {label : "验收结论:", dataIndex : '', fontSize : 11, position : ["450","2%","90%",5]}, + {label : "验收日期:", dataIndex : '', fontSize : 11, position : ["450","65%","90%",5]}, + {label : "送货人:", dataIndex : '', fontSize : 11, position : ["475","2%","90%",5]}, + {label : "科室验收人:", dataIndex : '', fontSize : 11, position : ["475","40%","90%",5]}, + {label : "医械仓库管理人:", dataIndex : '', fontSize : 11, position : ["475","65%","90%",5]} + ], + currentPageNumber : {label : "第#页", fontSize : 11, position : ["495","75%","90%",5]}, + totalPageAmount : {label : "共&页", fontSize : 11, position : ["495","81%","90%",5]}, + goodsTable :{ + rowHeight : 25, + position : ["90","1%","97%","9cm"], + headRepeat : true, + donotPrintTotal : true, + columns : [ + {header : "名称", dataIndex : 'name', width : 220, align : 'left', fontSize : 11}, + {header : "生产厂家", dataIndex : 'manufacturer', width : 220, align : 'left', fontSize : 11}, + {header : "规格型号", dataIndex : 'model', width : 110, align : 'center', fontSize : 11}, + {header : "数量", dataIndex : 'amount', width : 40, align : 'center', fontSize : 11}, + {header : "生产批次号", dataIndex : '', width : 100, align : 'center', fontSize : 11}, + {header : "灭菌日期", dataIndex : '', width : 105, align : 'center', fontSize : 11}, + {header : "有效期", dataIndex : 'expDateStr', width : 105, align : 'center', fontSize : 11}, + {header : "批准文号/注册证号", dataIndex : 'certification', width : 60, align : 'center', fontSize : 11}, + {header : "经省平台采购", dataIndex : '', width : 75, align : 'center', fontSize : 11} + ] + } +} var purchasePlanConfig = { headerFooter : [ // 标题 @@ -1061,6 +1093,8 @@ foreignTousseAppliation : foreignTousseAppliationPrintConfig, //高值耗材入库单明细 expensiveGoodsEntry:ExpensiveGoodsEntryConfig, + //高值耗材入库单验收单 + expensiveGoodsEntryReceivingReport:expensiveGoodsReceivingReportPrintConfig, // 入库单列表 godownEntryList : godownEntryListPrintConfig, //盘盈盘亏列表 Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r21222 -r21894 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 21222) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 21894) @@ -1680,6 +1680,21 @@ LODOP.PREVIEW(); } } + +//高值耗材入库的验收单 +function printReceivingReportInfo(obj,printType) { + formTypeOfPrinted = "expensiveGoodsEntryReceivingReport"; + doGetLodop(); + LODOP.PRINT_INIT(""); + setPrinterByConfig(); + print2(obj); + if(printType == 0){//直接打印 + LODOP.PRINT(); + }else{//打印预览 + LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1); + LODOP.PREVIEW(); + } +} //一次性物品入\退库单列表 function printGodownEntryList(obj,printType) { formTypeOfPrinted = obj.formTypeOfPrinted; Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java =================================================================== diff -u -r21849 -r21894 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java (.../ExpensiveGoodsGodownEntryManagerImpl.java) (revision 21849) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java (.../ExpensiveGoodsGodownEntryManagerImpl.java) (revision 21894) @@ -533,20 +533,27 @@ if(invoicePlan == null){ throw new RuntimeException("未找到绑定的申请单的数据!申请单id为："+expensiveGoodsGodownEntry.getInvoicePlanId()); } - + //若有批次号 if(StringUtils.isNotBlank(expensiveGoodsGodownEntryItem.getBatchNumber())){ //处理批次 newExpensiveGoodsBatch(expensiveGoodsGodownEntryItem); } - - if(StringUtils.isBlank(model)){//默认型号 + //处理型号定义 + ExpensiveGoodsModel expensiveGoodsModel = new ExpensiveGoodsModel(); + if(StringUtils.isNotBlank(model)){ + // 按型号，高值耗材id查找型号定义 + expensiveGoodsModel = expensiveGoodsManager.getExpensiveGoodsModelByModel(model, expensiveGoodsId); + if(expensiveGoodsModel == null){ + //若为空则新建型号定义 + expensiveGoodsModel = newexpensiveGoodsModel(expensiveGoods, expensiveGoodsGodownEntryItem,model); + } + }else{ + //按高值耗材id查找默认的型号定义 + expensiveGoodsModel = expensiveGoodsManager.getDefaultExpensiveGoodsModel(expensiveGoodsId); + if(expensiveGoodsModel == null){ + throw new RuntimeException("未找expensiveGoodsId为:"+expensiveGoodsId+"的默认型号对象"); + } } - // 查找型号定义 - ExpensiveGoodsModel expensiveGoodsModel = expensiveGoodsManager.getExpensiveGoodsModelByModel(model, expensiveGoodsId); - if(expensiveGoodsModel == null){ - //若为空则新建型号定义 - expensiveGoodsModel = newexpensiveGoodsModel(expensiveGoods, expensiveGoodsGodownEntryItem,model); - } //查找型号库存定义 ExpensiveGoodsModelStock expensiveGoodsModelStock = expensiveGoodsManager.getExpensiveGoodsModelStockByModelId(warehouseID,expensiveGoodsModel.getId(), expensiveGoodsId); if(expensiveGoodsModelStock == null){ @@ -594,14 +601,14 @@ private ExpensiveGoodsModel newexpensiveGoodsModel(ExpensiveGoods expensiveGoods, ExpensiveGoodsGodownEntryItem expensiveGoodsGodownEntryItem,String model){ ExpensiveGoodsModel expensiveGoodsModel = new ExpensiveGoodsModel(); - ExpensiveGoodsSupplier expensiveGoodsSupplier = expensiveGoods.getRegistrationCertification(objectDao).getExpensiveGoodsSupplier(); + RegistrationCertification registrationCertification = expensiveGoods.getRegistrationCertification(objectDao); + ExpensiveGoodsSupplier expensiveGoodsSupplier = registrationCertification.getExpensiveGoodsSupplier(); expensiveGoodsModel.setExpensiveGoods(expensiveGoods); - expensiveGoodsModel.setModel(model); + expensiveGoodsModel.setModel(model);//型号 expensiveGoodsModel.setManufacturer(expensiveGoodsSupplier.getCompanyName());//生产厂家 if(StringUtils.isBlank(expensiveGoodsModel.getBarcode())){ - String barcode = serialNumManager - .getSerialNumberStr(SerialNum.TYPE_BARCODE); - expensiveGoodsModel.setBarcode(barcode); + String barcode = serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE); + expensiveGoodsModel.setBarcode(barcode);//条码 } objectDao.saveOrUpdate(expensiveGoodsModel); return expensiveGoodsModel; @@ -1414,94 +1421,127 @@ } //获取打印验收单的信息 -// @Override -// public void loadGodownEntryReceivingReportPrintData(String id,JSONObject jsonobject) { -// if(!DatabaseUtil.isPoIdValid(id)){ -// return; -// } -// ExpensiveGoodsGodownEntry expensiveGoodsGodownEntry = this.get(id); -// if(expensiveGoodsGodownEntry == null){ -// return; -// } -// List itemvoList = new ArrayList(); -// @SuppressWarnings("unchecked") -// List expensiveGoodsInstanceList = objectDao.findByProperty(ExpensiveGoodsInstance.class.getSimpleName(), -// "godownEntryId", id); -// Map seriesToVoMap = new HashMap(); -// + @Override + public void loadGodownEntryReceivingReportPrintData(String id,JSONObject jsonobject) { + if(!DatabaseUtil.isPoIdValid(id)){ + return; + } + ExpensiveGoodsGodownEntry expensiveGoodsGodownEntry = this.get(id); + if(expensiveGoodsGodownEntry == null){ + return; + } + List itemvoList = new ArrayList(); + @SuppressWarnings("unchecked") + List expensiveGoodsInstanceList = objectDao.findByProperty(ExpensiveGoodsInstance.class.getSimpleName(), + "godownEntryId", id); + Map seriesToVoMap = new HashMap(); + + for (ExpensiveGoodsInstance expensiveGoodsInstance : expensiveGoodsInstanceList) { + ExpensiveGodownEntryReceivingReportItemVO valueVo = new ExpensiveGodownEntryReceivingReportItemVO(); + RegistrationCertification registrationCertification = expensiveGoodsInstance.getExpensiveGoods().getRegistrationCertification(objectDao); + ExpensiveGoodsSupplier expensiveGoodsSupplier = registrationCertification.getExpensiveGoodsSupplier(); + String certification = registrationCertification.getCertification();//注册证号 + String manufacturerCompanyName = expensiveGoodsSupplier.getCompanyName();//生产厂家 + Long expensiveGoodsId = expensiveGoodsInstance.getExpensiveGoods().getId();//高值耗材定义id + Long modelId = expensiveGoodsInstance.getExpensiveGoodsModelId();//型号id + String modelName = expensiveGoodsInstance.getModel();//型号 + String expDateStr = ForgonDateUtils.safelyFormatDate(expensiveGoodsInstance.getExpDate(), Constants.DATEFORMAT_YYYYMMDD, ""); + valueVo.setExpensiveGoodsId(expensiveGoodsId); + valueVo.setAmount(1L); + valueVo.setName(expensiveGoodsInstance.getShowName()); + valueVo.setExpDateStr(expDateStr); + valueVo.setManufacturer(manufacturerCompanyName); + valueVo.setExpensiveGoodsModelId(modelId); + valueVo.setModel(modelName); + valueVo.setCertification(certification); + itemvoList.add(valueVo); + } + // for (ExpensiveGoodsInstance expensiveGoodsInstance : expensiveGoodsInstanceList) { -// //汇总物品 +// //汇总打印物品 // if(summaryPrintExpensiveGoodsAmount(seriesToVoMap,expensiveGoodsInstance)){ // continue; // }else{ // //若没有相同的高值耗材定义id，实例型号的则新建vo // ExpensiveGodownEntryReceivingReportItemVO valueVo = new ExpensiveGodownEntryReceivingReportItemVO(); -// String expDate = ForgonDateUtils.safelyFormatDate(expensiveGoodsInstance.getExpDate(), Constants.DATEFORMAT_YYYYMMDD, ""); -// String companyName = expensiveGoodsInstance.getExpensiveGoods().getRegistrationCertification(objectDao).getExpensiveGoodsSupplier().getCompanyName(); -// Long expensiveGoodsId = expensiveGoodsInstance.getExpensiveGoods().getId(); -// Long modelId = expensiveGoodsInstance.getExpensiveGoodsModelId(); +// RegistrationCertification registrationCertification = expensiveGoodsInstance.getExpensiveGoods().getRegistrationCertification(objectDao); +// ExpensiveGoodsSupplier expensiveGoodsSupplier = registrationCertification.getExpensiveGoodsSupplier(); +// String certification = registrationCertification.getCertification();//注册证号 +// String manufacturerCompanyName = expensiveGoodsSupplier.getCompanyName();//生产厂家 +// Long expensiveGoodsId = expensiveGoodsInstance.getExpensiveGoods().getId();//高值耗材定义id +// Long modelId = expensiveGoodsInstance.getExpensiveGoodsModelId();//型号id +// String modelName = expensiveGoodsInstance.getModel();//型号 +// String expDateStr = ForgonDateUtils.safelyFormatDate(expensiveGoodsInstance.getExpDate(), Constants.DATEFORMAT_YYYYMMDD, ""); // valueVo.setExpensiveGoodsId(expensiveGoodsId); -// valueVo.setAmount(1l); +// valueVo.setAmount(1L); // valueVo.setName(expensiveGoodsInstance.getShowName()); -// valueVo.setExpDate(expensiveGoodsInstance.getExpDate());//??失效期要String类型吗 -// valueVo.setManufacturer(companyName); +// valueVo.setExpDateStr(expDateStr); +// valueVo.setManufacturer(manufacturerCompanyName); // valueVo.setExpensiveGoodsModelId(modelId); +// valueVo.setModel(modelName); +// valueVo.setCertification(certification); // seriesToVoMap.put(seriesToVoMap.size()+1L,valueVo); // } // } // for(Entry entry : seriesToVoMap.entrySet()) { // itemvoList.add(entry.getValue()); // } -// String supplierName = expensiveGoodsGodownEntry.getSupplierName();//供应商 -// jsonobject.put("supplierName", supplierName); -// jsonobject.put("goods", itemvoList); -// } -// -// /** -// * 因为入库单会有高值耗材id相同但型号不同的明细实例 -// * 需要按入高值耗材id和型号进行汇总数量 -// * @param instanceIdToVoMap -// * @param expensiveGoodsInstance -// * @return true:不需要新建itemVo fals:需要新建itemVo -// */ -// private Boolean summaryPrintExpensiveGoodsAmount(Map instanceIdToVoMap,ExpensiveGoodsInstance expensiveGoodsInstance){ -// Long expensiveGoodsId = expensiveGoodsInstance.getExpensiveGoods().getId(); -// Long expensiveGoodsModelId = expensiveGoodsInstance.getExpensiveGoodsModelId(); -// if(instanceIdToVoMap.size()>0){ -// for(Entry entry : instanceIdToVoMap.entrySet()) { -// ExpensiveGodownEntryReceivingReportItemVO valueVo = entry.getValue(); -// //是否相同物品id -// if(expensiveGoodsId.equals(valueVo.getExpensiveGoodsId())){ -// //是否都有型号id -// if(DatabaseUtil.isPoIdValid(expensiveGoodsModelId)&&DatabaseUtil.isPoIdValid(valueVo.getExpensiveGoodsModelId())){ -// //是否相同的型号id -// if(expensiveGoodsModelId.equals(valueVo.getExpensiveGoodsModelId())){ -// Long amount = valueVo.getAmount()+1;//数量加1 -// valueVo.setAmount(amount); -// return true; -// } -// }else{ -// Long amount = valueVo.getAmount()+1;//数量加1 -// valueVo.setAmount(amount); -// return true; -// } -// } -// } -// }else{ -// //新建第一个map -// ExpensiveGodownEntryReceivingReportItemVO valueVo = new ExpensiveGodownEntryReceivingReportItemVO(); -// String expDate = ForgonDateUtils.safelyFormatDate(expensiveGoodsInstance.getExpDate(), Constants.DATEFORMAT_YYYYMMDD, ""); -// String companyName = expensiveGoodsInstance.getExpensiveGoods().getRegistrationCertification(objectDao).getExpensiveGoodsSupplier().getCompanyName(); -// Long modelId = expensiveGoodsInstance.getExpensiveGoodsModelId(); -// valueVo.setExpensiveGoodsId(expensiveGoodsId); -// valueVo.setAmount(1L); -// valueVo.setName(expensiveGoodsInstance.getShowName()); -// valueVo.setExpDate(expensiveGoodsInstance.getExpDate());//??失效期要String类型吗 -// valueVo.setManufacturer(companyName); -// valueVo.setExpensiveGoodsModelId(modelId); -// instanceIdToVoMap.put(1L,valueVo); -// return true; -// } -// return false; -// } + String supplierName = expensiveGoodsGodownEntry.getSupplierName();//供应商 + jsonobject.put("supplierName", supplierName); + jsonobject.put("goods", itemvoList); + } + + /** + * 因为入库单会有高值耗材id相同但型号不同的明细实例 + * 需要按入高值耗材id和型号进行汇总数量 + * @param instanceIdToVoMap + * @param expensiveGoodsInstance + * @return true:不需要新建itemVo fals:需要新建itemVo + */ + private Boolean summaryPrintExpensiveGoodsAmount(Map instanceIdToVoMap,ExpensiveGoodsInstance expensiveGoodsInstance){ + Long expensiveGoodsId = expensiveGoodsInstance.getExpensiveGoods().getId(); + Long expensiveGoodsModelId = expensiveGoodsInstance.getExpensiveGoodsModelId(); + if(instanceIdToVoMap.size()>0){ + for(Entry entry : instanceIdToVoMap.entrySet()) { + ExpensiveGodownEntryReceivingReportItemVO valueVo = entry.getValue(); + //是否相同物品id + if(expensiveGoodsId.equals(valueVo.getExpensiveGoodsId())){ + //是否都有型号id + if(DatabaseUtil.isPoIdValid(expensiveGoodsModelId)&&DatabaseUtil.isPoIdValid(valueVo.getExpensiveGoodsModelId())){ + //是否相同的型号id + if(expensiveGoodsModelId.equals(valueVo.getExpensiveGoodsModelId())){ + Long amount = valueVo.getAmount()+1;//数量加1 + valueVo.setAmount(amount); + return true; + } + }else{ + Long amount = valueVo.getAmount()+1;//数量加1 + valueVo.setAmount(amount); + return true; + } + } + } + }else{ + //新建第一个map + ExpensiveGodownEntryReceivingReportItemVO valueVo = new ExpensiveGodownEntryReceivingReportItemVO(); + RegistrationCertification registrationCertification = expensiveGoodsInstance.getExpensiveGoods().getRegistrationCertification(objectDao); + ExpensiveGoodsSupplier expensiveGoodsSupplier = registrationCertification.getExpensiveGoodsSupplier(); + String certification = registrationCertification.getCertification();//注册证号 + String manufacturerCompanyName = expensiveGoodsSupplier.getCompanyName();//生产厂家 + Long modelId = expensiveGoodsInstance.getExpensiveGoodsModelId();//型号id + String modelName = expensiveGoodsInstance.getModel();//型号 + String expDateStr = ForgonDateUtils.safelyFormatDate(expensiveGoodsInstance.getExpDate(), Constants.DATEFORMAT_YYYYMMDD, ""); + valueVo.setExpensiveGoodsId(expensiveGoodsId); + valueVo.setAmount(1L); + valueVo.setName(expensiveGoodsInstance.getShowName()); + valueVo.setExpDateStr(expDateStr); + valueVo.setManufacturer(manufacturerCompanyName); + valueVo.setExpensiveGoodsModelId(modelId); + valueVo.setModel(modelName); + valueVo.setCertification(certification); + instanceIdToVoMap.put(1L,valueVo); + return true; + } + return false; + } } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js =================================================================== diff -u -r21797 -r21894 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js (.../expensiveGoodsGodownEntryView.js) (revision 21797) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js (.../expensiveGoodsGodownEntryView.js) (revision 21894) @@ -246,7 +246,7 @@ * @param grade 类别 * @returns {Boolean} */ -function addItems(model,modelId,batchNumber,manufacturerId,manufacturerName,invoicePlanId,expensiveGoodsId, +function addItems(model,modelId,batchNumber,supplierId,manufacturerId,manufacturerName,invoicePlanId,expensiveGoodsId, expensiveGoodsName,expensiveGoodsdisplayName,cost,expDate,certification,firstBodyCode,secondBodyCode,thirdBodyCode,grade){ if(top.Ext.getCmp('name1').getValue() == null || top.Ext.getCmp('name1').getValue() == ''){ @@ -283,6 +283,10 @@ showResult("请填写生产厂家商!"); return false; } + if(top.Ext.getCmp('supplier1').getValue() == null || top.Ext.getCmp('supplier1').getValue() == ''){ + showResult("请填写供应商!"); + return false; + } // if(!sstsConfig.notValidateSupply && top.Ext.isEmpty(top.Ext.getCmp('manufacturer1'))){ // showResult("请填写生产厂家商!"); @@ -299,6 +303,14 @@ // return false; // } // } + //是否同一个供应商的物品 + for(var i = 0;i < top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getCount();i++){ + var expensiveGoodsGodownEntryItemData = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getAt(i).data; + if(expensiveGoodsGodownEntryItemData.supplierId != supplierId){ + showResult("一张入库单只能填同一个供应商!"); + return false; + } + } //填写的高值耗材名称是否存在于绑定的申请单里面 if(!matchingInvoicePlan(expensiveGoodsId)){ @@ -311,6 +323,7 @@ id : "", manufacturerId : manufacturerId, manufacturerName : manufacturerName, + supplierId : supplierId, expensiveGoodsId : expensiveGoodsId, expensiveGoodsName : expensiveGoodsName, expensiveGoodsdisplayName : expensiveGoodsdisplayName, @@ -461,6 +474,11 @@ showResult('请选择要绑定的申请单!'); return false; } + var supplierId = top.Ext.getCmp('supplierId').getValue(); + if(!supplierId||supplierId.length==0){ + showResult('请选择要供应商!'); + return false; + } var expDate = top.Ext.getCmp('expDate1').getValue(); var manufacturerName = top.Ext.getCmp('manufacturer1').getValue(); @@ -484,16 +502,16 @@ if(dateCompare(expDateStr,nextYearDate) != 1){ top.Ext.MessageBox.confirm("请确认","添加的物品失效日期在一年之内,确定要添加吗？",function(button, text){ if("yes" == button){ - addItems(model,"",batchNumber, manufacturerId , manufacturerName ,invoicePlanId, expensiveGoodsId,expensiveGoodsName, + addItems(model,"",batchNumber,supplierId, manufacturerId , manufacturerName ,invoicePlanId, expensiveGoodsId,expensiveGoodsName, expensiveGoodsdisplayName,cost,expDate,certification,firstBodyCode,secondBodyCode,thirdBodyCode,grade); var grid = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid'); setTotalMoney(grid); - top.Ext.getCmp('manufacturer1').focus(); - top.Ext.getCmp('manufacturer1').selectText(); + top.Ext.getCmp('name1').focus(); + top.Ext.getCmp('name1').selectText(); } }); }else{ - addItems(model,"",batchNumber,manufacturerId , manufacturerName ,invoicePlanId, expensiveGoodsId,expensiveGoodsName, + addItems(model,"",batchNumber,supplierId,manufacturerId , manufacturerName ,invoicePlanId, expensiveGoodsId,expensiveGoodsName, expensiveGoodsdisplayName,cost,expDate,certification,firstBodyCode,secondBodyCode,thirdBodyCode,grade); var grid = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid'); setTotalMoney(grid); @@ -605,6 +623,7 @@ expDate : new Date(resultEntryItem[i].expDate.time), manufacturerId : resultEntryItem[i].manufacturerId, manufacturerName : resultEntryItem[i].manufacturerName, + supplierId : resultEntryData.supplierId, firstBodyCode : resultEntryItem[i].firstBodyCode, secondBodyCode : resultEntryItem[i].secondBodyCode, thirdBodyCode : resultEntryItem[i].thirdBodyCode, Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java =================================================================== diff -u -r21853 -r21894 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java (.../ExpensiveGodownEntryReceivingReportItemVO.java) (revision 21853) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java (.../ExpensiveGodownEntryReceivingReportItemVO.java) (revision 21894) @@ -48,6 +48,8 @@ private Long identificationID;// 标识对象的ID，以后不要使用identification来关联了。 private Date expDate;// 失效期 + + private String expDateStr; private String certification;// 注册证号 @@ -74,6 +76,14 @@ */ private Long expensiveGoodsId; + public String getExpDateStr() { + return expDateStr; + } + + public void setExpDateStr(String expDateStr) { + this.expDateStr = expDateStr; + } + public Long getExpensiveGoodsId() { return expensiveGoodsId; }