Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java =================================================================== diff -u -r22064 -r22075 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java (.../ExpensiveGoodsGodownEntryManagerImpl.java) (revision 22064) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java (.../ExpensiveGoodsGodownEntryManagerImpl.java) (revision 22075) @@ -974,13 +974,21 @@ Long expensiveGoodsId = godownEntryItem .getExpensiveGoodsId(); Long expensiveGoodsStockId = godownEntryItem.getExpensiveGoodsStockId(); + Long expensiveGoodsModelId = godownEntryItem.getExpensiveGoodsModelId(); + Long expensiveGoodsModelStockId = godownEntryItem.getExpensiveGoodsModelStockId(); Long expensiveGoodsInstanceId = godownEntryItem.getExpensiveGoodsInstanceId(); if (DatabaseUtil.isPoIdValid(expensiveGoodsId)) { expensiveGoodsIDsSet.add(expensiveGoodsId); } if (DatabaseUtil.isPoIdValid(expensiveGoodsStockId)) { expensiveGoodsServiceContext.getExpensiveGoodsStockIdsSet().add(expensiveGoodsStockId); } + if (DatabaseUtil.isPoIdValid(expensiveGoodsModelId)) { + expensiveGoodsServiceContext.getExpensiveGoodsModelIdsSet().add(expensiveGoodsModelId); + } + if (DatabaseUtil.isPoIdValid(expensiveGoodsModelStockId)) { + expensiveGoodsServiceContext.getExpensiveGoodsModelStockIdsSet().add(expensiveGoodsModelStockId); + } if (DatabaseUtil.isPoIdValid(expensiveGoodsInstanceId)) { expensiveGoodsServiceContext.getExpensiveGoodsInstanceIdsSet().add(expensiveGoodsInstanceId); } @@ -1158,9 +1166,12 @@ if(DatabaseUtil.isPoIdValid(id)){ entry.setId(id); } - if(!DatabaseUtil.isPoIdValid(invoicePlanId)){ - throw new RuntimeException("绑定的申请单id参数有误!"); + if(entry.typeIn()){ + if(!DatabaseUtil.isPoIdValid(invoicePlanId)){ + throw new RuntimeException("绑定的申请单id参数有误!"); + } } + entry.setInvoicePlanId(invoicePlanId); entry.setRemark(remark); entry.setWarehouseID(wareHouseId); @@ -1455,7 +1466,7 @@ String certification = registrationCertification.getCertification();//注册证号 String manufacturerCompanyName = expensiveGoodsSupplier.getCompanyName();//生产厂家 Long expensiveGoodsId = expensiveGoodsInstance.getExpensiveGoods().getId();//高值耗材定义id - Long modelId = expensiveGoodsInstance.getExpensiveGoodsModelId();//型号id + Long expensiveGoodsModelId = expensiveGoodsInstance.getExpensiveGoodsModelId();//型号id String modelName = expensiveGoodsInstance.getModel();//型号 String batchNumber = expensiveGoodsInstance.getBatchNumber();//批次号 String expDateStr = ForgonDateUtils.safelyFormatDate(expensiveGoodsInstance.getExpDate(), Constants.DATEFORMAT_YYYYMMDD, ""); @@ -1464,7 +1475,7 @@ valueVo.setName(expensiveGoodsInstance.getShowName()); valueVo.setExpDateStr(expDateStr); valueVo.setManufacturer(manufacturerCompanyName); - valueVo.setExpensiveGoodsModelId(modelId); + valueVo.setExpensiveGoodsModelId(expensiveGoodsModelId); valueVo.setModel(modelName); valueVo.setCertification(certification); valueVo.setBatchNumber(batchNumber); @@ -1483,15 +1494,15 @@ // String certification = registrationCertification.getCertification();//注册证号 // String manufacturerCompanyName = expensiveGoodsSupplier.getCompanyName();//生产厂家 // Long expensiveGoodsId = expensiveGoodsInstance.getExpensiveGoods().getId();//高值耗材定义id -// Long modelId = expensiveGoodsInstance.getExpensiveGoodsModelId();//型号id +// Long expensiveGoodsModelId = 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.setExpensiveGoodsModelId(expensiveGoodsModelId); // valueVo.setModel(modelName); // valueVo.setCertification(certification); // seriesToVoMap.put(seriesToVoMap.size()+1L,valueVo); @@ -1726,15 +1737,15 @@ ExpensiveGoodsSupplier expensiveGoodsSupplier = registrationCertification.getExpensiveGoodsSupplier(); String certification = registrationCertification.getCertification();//注册证号 String manufacturerCompanyName = expensiveGoodsSupplier.getCompanyName();//生产厂家 - Long modelId = expensiveGoodsInstance.getExpensiveGoodsModelId();//型号id + Long expensiveGoodsModelId = 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.setExpensiveGoodsModelId(expensiveGoodsModelId); valueVo.setModel(modelName); valueVo.setCertification(certification); instanceIdToVoMap.put(1L,valueVo); Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js =================================================================== diff -u -r22047 -r22075 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js (.../expensiveGoodsGodownEntryView.js) (revision 22047) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js (.../expensiveGoodsGodownEntryView.js) (revision 22075) @@ -211,7 +211,7 @@ {name : 'certification'}, {name : 'batchNumber'}, {name : 'model'}, - {name : 'modelId'}, + {name : 'expensiveGoodsModelId'}, {name : 'modelStockID'}, {name : 'expDate' ,type : 'date'}, {name : 'cost'}, @@ -257,7 +257,7 @@ * @param grade 类别 * @returns {Boolean} */ -function addItems(model,modelId,batchNumber,supplierId,manufacturerId,manufacturerName,invoicePlanId,expensiveGoodsId, +function addItems(model,expensiveGoodsModelId,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() == ''){ @@ -345,7 +345,7 @@ certification:certification, batchNumber : batchNumber, model : model, - modelId : modelId, + expensiveGoodsModelId : expensiveGoodsModelId, expDate : expDate, cost : Ext.num(parseFloat(cost),0), firstBodyCode:firstBodyCode, @@ -633,8 +633,8 @@ certification : resultEntryItem[i].certification, batchNumber : resultEntryItem[i].batchNumber, model : resultEntryItem[i].model, - modelId : resultEntryItem[i].modelId, - modelStockId : resultEntryItem[i].modelStockId, + expensiveGoodsModelId : resultEntryItem[i].expensiveGoodsModelId, + expensiveGoodsModelStockId : resultEntryItem[i].expensiveGoodsModelStockId, expDate : new Date(resultEntryItem[i].expDate.time), manufacturerId : resultEntryItem[i].manufacturerId, manufacturerName : resultEntryItem[i].manufacturerName, Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java =================================================================== diff -u -r22064 -r22075 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java (.../ExpensiveGoodsGodownEntryAction.java) (revision 22064) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java (.../ExpensiveGoodsGodownEntryAction.java) (revision 22075) @@ -222,7 +222,7 @@ * @param entry */ private void buildGodownEntryParamsForSave(ExpensiveGoodsGodownEntry entry) { - //格式为:[{"id":"","model":"01款","modelId":"","batchNumber":"","manufacturerId":"2","manufacturerName":"戴姆勒梅赛德斯奔驰汽车公司","expensiveGoodsId":"5","expensiveGoodsName":"奔驰c[2018款]","certification":"2017122301","cost":269800,"expDate":"2018-01-31","firstBodyCode":"","secondBodyCode":"","thirdBodyCode":"","supplierId":"4","supplierName":"奔驰广州供应商","invoicePlanId":"108568","localID":1},{"id":"","model":"02款","modelId":"","batchNumber":"","manufacturerId":"2","manufacturerName":"戴姆勒梅赛德斯奔驰汽车公司","expensiveGoodsId":"6","expensiveGoodsName":"奔驰e300[E级]","certification":"2017122302","cost":420000,"expDate":"2018-01-12","firstBodyCode":"","secondBodyCode":"","thirdBodyCode":"","supplierId":"4","supplierName":"奔驰广州供应商","invoicePlanId":"108568","localID":2}] + //格式为:[{"id":"","model":"01款","expensiveGoodsModelId":"","batchNumber":"","manufacturerId":"2","manufacturerName":"戴姆勒梅赛德斯奔驰汽车公司","expensiveGoodsId":"5","expensiveGoodsName":"奔驰c[2018款]","certification":"2017122301","cost":269800,"expDate":"2018-01-31","firstBodyCode":"","secondBodyCode":"","thirdBodyCode":"","supplierId":"4","supplierName":"奔驰广州供应商","invoicePlanId":"108568","localID":1},{"id":"","model":"02款","expensiveGoodsModelId":"","batchNumber":"","manufacturerId":"2","manufacturerName":"戴姆勒梅赛德斯奔驰汽车公司","expensiveGoodsId":"6","expensiveGoodsName":"奔驰e300[E级]","certification":"2017122302","cost":420000,"expDate":"2018-01-12","firstBodyCode":"","secondBodyCode":"","thirdBodyCode":"","supplierId":"4","supplierName":"奔驰广州供应商","invoicePlanId":"108568","localID":2}] String items = StrutsParamUtils.getPraramValue("items", ""); //格式为:{"id":"","remark":"","time":"2017-12-27T21:08:00","warehouseName":"\u6d88\u6bd2\u4f9b\u5e94\u4e2d\u5fc3\u4ed3\u5e93","warehouseID":"3854","invoicePlanId":"1"} String formParams = StrutsParamUtils.getPraramValue("formParams", ""); @@ -425,8 +425,8 @@ itemData.put("certification", expensiveGoodsGodownEntryItem.getCertification()); itemData.put("batchNumber", expensiveGoodsGodownEntryItem.getBatchNumber()); itemData.put("model", expensiveGoodsGodownEntryItem.getModel()); - itemData.put("modelId", expensiveGoodsGodownEntryItem.getExpensiveGoodsModelId()); - itemData.put("modelStockId", expensiveGoodsGodownEntryItem.getExpensiveGoodsModelStockId()); + itemData.put("expensiveGoodsModelId", expensiveGoodsGodownEntryItem.getExpensiveGoodsModelId()); + itemData.put("expensiveGoodsModelStockId", expensiveGoodsGodownEntryItem.getExpensiveGoodsModelStockId()); itemData.put("firstBodyCode", expensiveGoodsGodownEntryItem.getFirstBodyCode()); itemData.put("secondBodyCode", expensiveGoodsGodownEntryItem.getSecondBodyCode()); itemData.put("thirdBodyCode", expensiveGoodsGodownEntryItem.getThirdBodyCode()); Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java =================================================================== diff -u -r21777 -r22075 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java (.../ExpensiveGoodsGodownEntryItemManagerImpl.java) (revision 21777) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java (.../ExpensiveGoodsGodownEntryItemManagerImpl.java) (revision 22075) @@ -131,8 +131,8 @@ String thirdBodyCode = itemObject.optString("thirdBodyCode");// 第三个自身条码 String grade = itemObject.optString("grade");// 级别 String expensiveGoodsModel = JSONUtil.optString(itemObject,"model",null);//型号 - Long expensiveGoodsModelId = JSONUtil.optLong(itemObject,"modelId",null);//型号id - Long expensiveGoodsModelStockId = JSONUtil.optLong(itemObject,"modelStockId",null);//型号库存id + Long expensiveGoodsModelId = JSONUtil.optLong(itemObject,"expensiveGoodsModelId",null);//型号id + Long expensiveGoodsModelStockId = JSONUtil.optLong(itemObject,"expensiveGoodsModelStockId",null);//型号库存id ExpensiveGoodsGodownEntryItem godownEntryItem = new ExpensiveGoodsGodownEntryItem(); godownEntryItem.setId(itemId); godownEntryItem.setSupplierId(Long.valueOf(supplierId)); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntry.java =================================================================== diff -u -r21849 -r22075 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntry.java (.../ExpensiveGoodsGodownEntry.java) (revision 21849) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntry.java (.../ExpensiveGoodsGodownEntry.java) (revision 22075) @@ -10,11 +10,12 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Index; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.persistence.Index; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; @@ -223,6 +224,12 @@ this.itemsList = itemsList; } + public boolean typeIn(){ + return StringUtils.equals(type, TYPE_IN); + } + public boolean typeOut(){ + return StringUtils.equals(type, TYPE_OUT); + } public String getType() { return type; } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js =================================================================== diff -u -r22054 -r22075 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js (.../expensiveGoodsGodownEntryForm.js) (revision 22054) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js (.../expensiveGoodsGodownEntryForm.js) (revision 22075) @@ -529,7 +529,7 @@ {name : 'certification'}, {name : 'name'}, {name : 'model'}, - {name : 'modelId'}, + {name : 'expensiveGoodsModelId'}, {name : 'batchNumber'}, {name : 'deleteButton'}, {name : 'grade'} @@ -990,7 +990,7 @@ items.push({ id : record.data.id, model : record.data.model, //型号 - modelId : record.data.modelId, //型号id + expensiveGoodsModelId : record.data.expensiveGoodsModelId, //型号id batchNumber : record.data.batchNumber,//批次 manufacturerId : record.data.manufacturerId, manufacturerName : record.data.manufacturerName, @@ -1124,7 +1124,7 @@ items.push({ id : record.data.id, model : record.data.model, //型号 - modelId : record.data.modelId, //型号id + expensiveGoodsModelId : record.data.expensiveGoodsModelId, //型号id batchNumber : record.data.batchNumber,//批次 manufacturerId : record.data.manufacturerId, manufacturerName : record.data.manufacturerName,