Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js =================================================================== diff -u -r22333 -r22341 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js (.../expensiveGoodsView.js) (revision 22333) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js (.../expensiveGoodsView.js) (revision 22341) @@ -248,6 +248,7 @@ //********* 2、ForgonGrid *********** var columns = [ {header : "名称",width : 200,dataIndex : 'name', renderer : rendeColor}, + {header : "生产厂家",width : 180,dataIndex : 'registrationCertification.expensiveGoodsSupplier.companyName'}, {header : "单位",width : 50,dataIndex : 'unit'}, {header : "注册证",width : 150,dataIndex : 'certification'}, // {header : "规格",width : 100,dataIndex : 'specification'}, @@ -298,6 +299,8 @@ {name : 'isPartOfTousseMaterial'}, {name : 'referencePrice'}, {name : 'isApplicationMaterial'}, + {name : "registrationCertification.certification"}, + {name : "registrationCertification.expensiveGoodsSupplier.companyName"}, {name : 'isSupplyRoomGoods'} ]; Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java =================================================================== diff -u -r22333 -r22341 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java (.../ExpensiveGoodsAction.java) (revision 22333) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java (.../ExpensiveGoodsAction.java) (revision 22341) @@ -191,38 +191,43 @@ StrutsResponseUtils.output(result); } +// /** +// * 保存前检查是否重复 +// * +// * @return +// */ +// public String validate() { +// String id = StrutsParamUtils.getPraramValue("validateId", null); +// String name = StrutsParamUtils.getPraramValue("valifateName", null); +// String specification = StrutsParamUtils.getPraramValue("specification", +// null); +// String message = "{success:true,message:'验证成功',stauts:1}"; +// boolean result = expensiveGoodsManager.verifyExpensiveGoods(id, name, +// specification); +// if (!result) { +// message = "{success:false,message:'一次性物品的名称不唯一',stauts:0}"; +// ; +// } +// HttpServletResponse httpServletResponse = StrutsParamUtils +// .getResponse(); +// httpServletResponse.setContentType("text/html;charset=UTF-8"); +// try { +// httpServletResponse.getWriter().print(message); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// return null; +// } + + /** - * 保存前检查是否重复 - * + * 保存高值耗材，由高值耗材定义保存调用。 + * 先验证高值耗材名称、注册证的可用性，然后保存 * @return */ - public String validate() { - String id = StrutsParamUtils.getPraramValue("validateId", null); - String name = StrutsParamUtils.getPraramValue("valifateName", null); - String specification = StrutsParamUtils.getPraramValue("specification", - null); - String message = "{success:true,message:'验证成功',stauts:1}"; - boolean result = expensiveGoodsManager.verifyExpensiveGoods(id, name, - specification); - if (!result) { - message = "{success:false,message:'一次性物品的名称不唯一',stauts:0}"; - ; - } - HttpServletResponse httpServletResponse = StrutsParamUtils - .getResponse(); - httpServletResponse.setContentType("text/html;charset=UTF-8"); - try { - httpServletResponse.getWriter().print(message); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - - - // 保存高值耗材定义 public String saveExpensiveGoods() { String supplierName = StrutsParamUtils.getPraramValue("supplierName",""); + String certificationId = StrutsParamUtils.getPraramValue("certificationId",""); JSONObject obj = new JSONObject(); obj.put("success", true); try { @@ -235,54 +240,26 @@ if("".equals(supplierName)){ throw new RuntimeException("生产厂家不能为空！"); } + if("".equals(certificationId)){ + throw new RuntimeException("注册证不能为空！"); + } long start = System.currentTimeMillis(); - boolean vr = expensiveGoodsManager.verifyExpensiveGoods(id, expensiveGoods.getName(),supplierName); - if (!vr) { - throw new RuntimeException("高值耗材名称不唯一!"); + int vr = expensiveGoodsManager.verifyExpensiveGoods(id, expensiveGoods.getName(),supplierName,certificationId); + if (vr == 1) { + throw new RuntimeException("同一生产厂家的高值耗材名称不唯一!"); + }else if(vr == 2){ + throw new RuntimeException("此注册证号已被使用!"); + }else if(vr == 3){ + throw new RuntimeException("同一生产厂家的高值耗材名称不唯一，并且此注册证号已被使用!"); } - long end = System.currentTimeMillis(); - System.out.println("action检验唯一 花费："+(end-start)); - expensiveGoods.setNotInventoryGoods(StrutsParamUtils.getPraramValue("isInventoryGoods", "")); - + expensiveGoods.setNotInventoryGoods(StrutsParamUtils.getPraramValue("isInventoryGoods", "")); //获取型号列表 - start = System.currentTimeMillis(); String expensiveGoodsModelLists = StrutsParamUtils.getPraramValue("expensiveGoodsModelLists",""); expensiveGoodsManager.setExpensiveGoodsModelListbyJSONString(expensiveGoodsModelLists,expensiveGoods); - end = System.currentTimeMillis(); - System.out.println("action获取型号列表 花费："+(end-start)); - - if(DatabaseUtil.isPoIdValid(expensiveGoods.getId())){ - - start = System.currentTimeMillis(); - ExpensiveGoods origineDG = expensiveGoodsManager.getExpensiveGoodsById_ForUpdate(expensiveGoods.getId().toString()); - - end = System.currentTimeMillis(); - System.out.println("action获取锁 花费："+(end-start)); - // 记录日志 - - - start = System.currentTimeMillis(); - if(origineDG != null){ - appLogManager = (LogManager) SpringBeanManger.getBean("appLogManager"); - String result = "包定义id=" + origineDG.getId() + ";" + compareexpensiveGoodsDefinition(origineDG , expensiveGoods); - if(StringUtils.isNotBlank(result)){ - appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_EXPENSIVEGOODS, Log.TYPE_UPDATE, result); - } - } - - - end = System.currentTimeMillis(); - System.out.println("action记录日志 花费："+(end-start)); - expensiveGoodsManager.updateExpensiveGoods_TRANS_REQUIRED(expensiveGoods); - }else{ - start = System.currentTimeMillis(); - expensiveGoodsManager.save(expensiveGoods); - end = System.currentTimeMillis(); - System.out.println("action保存 花费："+(end-start)); - } - + //保存 + expensiveGoodsManager.saveExpensiveGoods(expensiveGoods); } } catch (Exception e) { e.printStackTrace(); @@ -413,54 +390,6 @@ // } } - - public void loadExpensiveExpensiveGoods() { -// String expensiveGoodsId = StrutsParamUtils.getPraramValue( -// "expensiveGoodsId", ""); -// String expensiveGoodsStockIds = StrutsParamUtils.getPraramValue( -// "expensiveGoodsStockIds", ""); -// String expensiveGoodsBatchStockIds = StrutsParamUtils.getPraramValue( -// "expensiveGoodsBatchStockIds", ""); -// List expensiveDisposablegoodsList = expensiveGoodsManager -// .getCurrentUserOrgUnitWarehouseExpensiveexpensiveGoods( -// expensiveGoodsId, expensiveGoodsStockIds, -// expensiveGoodsBatchStockIds); -// -// if (expensiveDisposablegoodsList == null) { -// expensiveDisposablegoodsList = new ArrayList(); -// } -// JSONArray jobjs = new JSONArray(); -// for (ExpensiveDisposablegoods expensiveDisposablegoods : expensiveDisposablegoodsList) { -// JSONObject jobj = JSONObject.fromObject(JSONUtil.toJSONStringEx( -// expensiveDisposablegoods, true, new String[] { -// "expensiveGoodsBatchStock", -// "ColumnNameAndPoPropertyNameMap" })); -// ExpensiveGoodsBatchStock expensiveGoodsBatchStock = expensiveDisposablegoods -// .getExpensiveGoodsBatchStock(); -// if (expensiveGoodsBatchStock != null) { -// jobj.put("batchNumber", -// expensiveGoodsBatchStock.getBatchNumber()); -// jobj.put("supplierName", -// expensiveGoodsBatchStock.getSupplierName()); -// jobj.put("expDate", -// expensiveGoodsBatchStock.getExpDateStr()); -// jobj.put("printTime", -// expensiveDisposablegoods.getPrintTimeStr()); -// -// } -// jobjs.add(jobj); -// } -// try { -// String jsonString = jobjs.toString(); -// StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); -// StrutsParamUtils.getResponse().getWriter().println(jsonString); -// } catch (Exception e) { -// e.printStackTrace(); -// } - } - - - public void deleteExpensiveGoods() { String idStr = StrutsParamUtils.getPraramValue("ids", ""); @@ -1060,85 +989,6 @@ } /** - * 比较一次性物品包定义的修改，用于记录日志 - * @param origineDG 修改前的包定义 - * @param expensiveGoods 修改后的包定义 - * @return - */ - public String compareexpensiveGoodsDefinition(ExpensiveGoods origineDG , ExpensiveGoods expensiveGoods){ - StringBuffer modifyContent = new StringBuffer(""); - if(!StringUtils.equals(origineDG.getName(), expensiveGoods.getName())){ - modifyContent.append("name属性修改前=").append(origineDG.getName()).append(",修改后=").append(expensiveGoods.getName()).append(";"); - } - if(!StringUtils.equals(origineDG.getInventorySerialNumber(), expensiveGoods.getInventorySerialNumber())){ - modifyContent.append("InventorySerialNumber属性修改前=").append(origineDG.getInventorySerialNumber()).append(",修改后=").append(expensiveGoods.getInventorySerialNumber()).append(";"); - } - if(!StringUtils.equals(origineDG.getCertification(), expensiveGoods.getCertification())){ - modifyContent.append("Certification属性修改前=").append(origineDG.getCertification()).append(",修改后=").append(expensiveGoods.getCertification()).append(";"); - } - if(!StringUtils.equals(origineDG.getExternalCode(), expensiveGoods.getExternalCode())){ - modifyContent.append("ExternalCode属性修改前=").append(origineDG.getExternalCode()).append(",修改后=").append(expensiveGoods.getExternalCode()).append(";"); - } - if(!StringUtils.equals(origineDG.getGrade(), expensiveGoods.getGrade())){ - modifyContent.append("Grade属性修改前=").append(origineDG.getGrade()).append(",修改后=").append(expensiveGoods.getGrade()).append(";"); - } - if(!StringUtils.equals(origineDG.getGuid(), expensiveGoods.getGuid())){ - modifyContent.append("Guid属性修改前=").append(origineDG.getGuid()).append(",修改后=").append(expensiveGoods.getGuid()).append(";"); - } - if(!StringUtils.equals(origineDG.getIsApplicationMaterial(), expensiveGoods.getIsApplicationMaterial())){ - modifyContent.append("IsApplicationMaterial属性修改前=").append(origineDG.getIsApplicationMaterial()).append(",修改后=").append(expensiveGoods.getIsApplicationMaterial()).append(";"); - } - if(!StringUtils.equals(origineDG.getIsPartOfTousseMaterial(), expensiveGoods.getIsPartOfTousseMaterial())){ - modifyContent.append("IsPartOfTousseMaterial属性修改前=").append(origineDG.getIsPartOfTousseMaterial()).append(",修改后=").append(expensiveGoods.getIsPartOfTousseMaterial()).append(";"); - } - if(!StringUtils.equals(origineDG.getIsSupplyRoomGoods(), expensiveGoods.getIsSupplyRoomGoods())){ - modifyContent.append("IsSupplyRoomGoods属性修改前=").append(origineDG.getIsSupplyRoomGoods()).append(",修改后=").append(expensiveGoods.getIsSupplyRoomGoods()).append(";"); - } - if((origineDG.getMaxStorage() == null ? 0 : origineDG.getMaxStorage().intValue()) != (expensiveGoods.getMaxStorage() == null ? 0 : expensiveGoods.getMaxStorage().intValue())){ - modifyContent.append("MaxStorage属性修改前=").append(origineDG.getMaxStorage()).append(",修改后=").append(expensiveGoods.getMaxStorage()).append(";"); - } - if((origineDG.getMinApplyAmount() == null ? 0 : origineDG.getMinApplyAmount().intValue()) != (expensiveGoods.getMinApplyAmount() == null ? 0 : expensiveGoods.getMinApplyAmount().intValue())){ - modifyContent.append("MinApplyAmount属性修改前=").append(origineDG.getMinApplyAmount()).append(",修改后=").append(expensiveGoods.getMinApplyAmount()).append(";"); - } - if((origineDG.getMinStorage() == null ? 0 : origineDG.getMinStorage().intValue()) != (expensiveGoods.getMinStorage() == null ? 0 : expensiveGoods.getMinStorage().intValue())){ - modifyContent.append("MinStorage属性修改前=").append(origineDG.getMinStorage()).append(",修改后=").append(expensiveGoods.getMinStorage()).append(";"); - } - if(!StringUtils.equals(origineDG.getPackageSpec(), expensiveGoods.getPackageSpec())){ - modifyContent.append("PackageSpec属性修改前=").append(origineDG.getPackageSpec()).append(",修改后=").append(expensiveGoods.getPackageSpec()).append(";"); - } - if(!StringUtils.equals(origineDG.getPrintInLabel(), expensiveGoods.getPrintInLabel())){ - modifyContent.append("PrintInLabel属性修改前=").append(origineDG.getPrintInLabel()).append(",修改后=").append(expensiveGoods.getPrintInLabel()).append(";"); - } - if(!StringUtils.equals(origineDG.getSpecification(), expensiveGoods.getSpecification())){ - modifyContent.append("Specification属性修改前=").append(origineDG.getSpecification()).append(",修改后=").append(expensiveGoods.getSpecification()).append(";"); - } - - if(!StringUtils.equals(origineDG.getType(), expensiveGoods.getType())){ - modifyContent.append("Type属性修改前=").append(origineDG.getType()).append(",修改后=").append(expensiveGoods.getType()).append(";"); - } - if(!StringUtils.equals(origineDG.getUnit(), expensiveGoods.getUnit())){ - modifyContent.append("Unit属性修改前=").append(origineDG.getUnit()).append(",修改后=").append(expensiveGoods.getUnit()).append(";"); - } - - if(!StringUtils.equals(origineDG.getNotInventoryDeptCode(), expensiveGoods.getNotInventoryDeptCode())){ - modifyContent.append("NotInventoryDeptCode属性修改前=").append(origineDG.getNotInventoryDeptCode()).append(",修改后=").append(expensiveGoods.getNotInventoryDeptCode()).append(";"); - } - if((origineDG.getReferencePrice() == null ? 0 : origineDG.getReferencePrice().doubleValue()) != (expensiveGoods.getReferencePrice() == null ? 0 : expensiveGoods.getReferencePrice().doubleValue())){ - modifyContent.append("ReferencePrice属性修改前=").append(origineDG.getReferencePrice()).append(",修改后=").append(expensiveGoods.getReferencePrice()).append(";"); - } - - if((origineDG.getMaxApplyAmount() == null ? 0 : origineDG.getMaxApplyAmount().doubleValue()) != (expensiveGoods.getMaxApplyAmount() == null ? 0 : expensiveGoods.getMaxApplyAmount().doubleValue())){ - modifyContent.append("MaxApplyAmount属性修改前=").append(origineDG.getMaxApplyAmount()).append(",修改后=").append(expensiveGoods.getMaxApplyAmount()).append(";"); - } - - if((origineDG.getSequence() == null ? 0 : origineDG.getSequence().intValue()) != (expensiveGoods.getSequence() == null ? 0 : expensiveGoods.getSequence().intValue())){ - modifyContent.append("Sequence属性修改前=").append(origineDG.getSequence()).append(",修改后=").append(expensiveGoods.getSequence()).append(";"); - } - - return modifyContent.toString(); - } - - /** * 根据拼音获取所有高值耗材定义Json */ public void getExpensiveGoodsJson() { Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java =================================================================== diff -u -r22333 -r22341 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java (.../ExpensiveGoodsManager.java) (revision 22333) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java (.../ExpensiveGoodsManager.java) (revision 22341) @@ -41,8 +41,7 @@ public ExpensiveGoodsStock getExpensiveGoodsStockByExpensiveGoodsID(Long warehouseID,Long expensiveGoodssID); - public boolean verifyExpensiveGoods(String id, String name, - String specification); + public int verifyExpensiveGoods(String id, String name,String supplierName,String registrationId); public String getExpensiveGoodsTypeTreeJson(); @@ -335,4 +334,8 @@ * @return */ public JSONArray getExpensiveGoodsModelStock(String id,String warehouseId); + /** + * 保存高值耗材 + */ + public void saveExpensiveGoods(ExpensiveGoods expensiveGoods); } Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java =================================================================== diff -u -r22336 -r22341 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java (.../ExpensiveGoodsManagerImpl.java) (revision 22336) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java (.../ExpensiveGoodsManagerImpl.java) (revision 22341) @@ -77,6 +77,7 @@ import com.forgon.disinfectsystem.expensivegoods.ExpensiveGoodsServiceContext; import com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao; import com.forgon.disinfectsystem.inventorymanagement.model.Inventory; +import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.security.tools.Util; import com.forgon.serialnumber.model.SerialNum; @@ -87,7 +88,9 @@ import com.forgon.tools.GB2Alpha; import com.forgon.tools.GB2WB; import com.forgon.tools.MathTools; +import com.forgon.tools.SpringBeanManger; import com.forgon.tools.SqlBuilder; +import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; @@ -676,23 +679,26 @@ } @Override - public boolean verifyExpensiveGoods(String id, String name, - String supplierName) { + public int verifyExpensiveGoods(String id, String name, + String supplierName,String certificationId) { + int status = 0;//0：正常 1：名字冲突 2：注册证已用 3:名字冲突,注册证已用 String sql = "where po.name = '" + name + "'"; if (StringUtils.isNotEmpty(id)) { sql += " and po.id != " + id; } -// sql += " and po.certificationId in ( select id from RegistrationCertification where expensiveGoodsSupplier_id in (select id from ExpensiveGoodsSupplier where companyName = '" -// + supplierName + "'))"; - sql += " and po.registrationCertification.expensiveGoodsSupplier.id in (select id from ExpensiveGoodsSupplier where companyName = '" + String nameConflictTestSql = sql + " and po.registrationCertification.expensiveGoodsSupplier.id in (select id from ExpensiveGoodsSupplier where companyName = '" + supplierName + "')"; -// sql += String.format(" and %s", SqlUtils.getStringFieldPredicateWithBlankHandling("po.specification", specification)); - - if (objectDao.countObjectBySql(ExpensiveGoods.class.getSimpleName(), sql) != 0) { - return false; - } else { - return true; + if (objectDao.countObjectBySql(ExpensiveGoods.class.getSimpleName(), nameConflictTestSql) != 0) { + status = 1; } + String certificationConflictTestsql = "where po.registrationCertification.id = " + certificationId; + if (StringUtils.isNotEmpty(id)) { + certificationConflictTestsql += " and po.id != " + id; + } + if(objectDao.countObjectBySql(ExpensiveGoods.class.getSimpleName(), certificationConflictTestsql) != 0) { + status += 2; + } + return status; } @Override @@ -2554,4 +2560,101 @@ } return jsonArray; } + + @Override + public void saveExpensiveGoods(ExpensiveGoods expensiveGoods){ + if(DatabaseUtil.isPoIdValid(expensiveGoods.getId())){ + ExpensiveGoods origineDG = getExpensiveGoodsById_ForUpdate(expensiveGoods.getId().toString()); + + if(origineDG != null){ + appLogManager = (LogManager) SpringBeanManger.getBean("appLogManager"); + String result = "包定义id=" + origineDG.getId() + ";" + compareexpensiveGoodsDefinition(origineDG , expensiveGoods); + if(StringUtils.isNotBlank(result)){ + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_EXPENSIVEGOODS, Log.TYPE_UPDATE, result); + } + } + updateExpensiveGoods_TRANS_REQUIRED(expensiveGoods); + }else{ + save(expensiveGoods); + } + } + + /** + * 比较一次性物品包定义的修改，用于记录日志 + * @param origineDG 修改前的包定义 + * @param expensiveGoods 修改后的包定义 + * @return + */ + private String compareexpensiveGoodsDefinition(ExpensiveGoods origineDG , ExpensiveGoods expensiveGoods){ + StringBuffer modifyContent = new StringBuffer(""); + if(!StringUtils.equals(origineDG.getName(), expensiveGoods.getName())){ + modifyContent.append("name属性修改前=").append(origineDG.getName()).append(",修改后=").append(expensiveGoods.getName()).append(";"); + } + if(!StringUtils.equals(origineDG.getInventorySerialNumber(), expensiveGoods.getInventorySerialNumber())){ + modifyContent.append("InventorySerialNumber属性修改前=").append(origineDG.getInventorySerialNumber()).append(",修改后=").append(expensiveGoods.getInventorySerialNumber()).append(";"); + } + if(!StringUtils.equals(origineDG.getCertification(), expensiveGoods.getCertification())){ + modifyContent.append("Certification属性修改前=").append(origineDG.getCertification()).append(",修改后=").append(expensiveGoods.getCertification()).append(";"); + } + if(!StringUtils.equals(origineDG.getExternalCode(), expensiveGoods.getExternalCode())){ + modifyContent.append("ExternalCode属性修改前=").append(origineDG.getExternalCode()).append(",修改后=").append(expensiveGoods.getExternalCode()).append(";"); + } + if(!StringUtils.equals(origineDG.getGrade(), expensiveGoods.getGrade())){ + modifyContent.append("Grade属性修改前=").append(origineDG.getGrade()).append(",修改后=").append(expensiveGoods.getGrade()).append(";"); + } + if(!StringUtils.equals(origineDG.getGuid(), expensiveGoods.getGuid())){ + modifyContent.append("Guid属性修改前=").append(origineDG.getGuid()).append(",修改后=").append(expensiveGoods.getGuid()).append(";"); + } + if(!StringUtils.equals(origineDG.getIsApplicationMaterial(), expensiveGoods.getIsApplicationMaterial())){ + modifyContent.append("IsApplicationMaterial属性修改前=").append(origineDG.getIsApplicationMaterial()).append(",修改后=").append(expensiveGoods.getIsApplicationMaterial()).append(";"); + } + if(!StringUtils.equals(origineDG.getIsPartOfTousseMaterial(), expensiveGoods.getIsPartOfTousseMaterial())){ + modifyContent.append("IsPartOfTousseMaterial属性修改前=").append(origineDG.getIsPartOfTousseMaterial()).append(",修改后=").append(expensiveGoods.getIsPartOfTousseMaterial()).append(";"); + } + if(!StringUtils.equals(origineDG.getIsSupplyRoomGoods(), expensiveGoods.getIsSupplyRoomGoods())){ + modifyContent.append("IsSupplyRoomGoods属性修改前=").append(origineDG.getIsSupplyRoomGoods()).append(",修改后=").append(expensiveGoods.getIsSupplyRoomGoods()).append(";"); + } + if((origineDG.getMaxStorage() == null ? 0 : origineDG.getMaxStorage().intValue()) != (expensiveGoods.getMaxStorage() == null ? 0 : expensiveGoods.getMaxStorage().intValue())){ + modifyContent.append("MaxStorage属性修改前=").append(origineDG.getMaxStorage()).append(",修改后=").append(expensiveGoods.getMaxStorage()).append(";"); + } + if((origineDG.getMinApplyAmount() == null ? 0 : origineDG.getMinApplyAmount().intValue()) != (expensiveGoods.getMinApplyAmount() == null ? 0 : expensiveGoods.getMinApplyAmount().intValue())){ + modifyContent.append("MinApplyAmount属性修改前=").append(origineDG.getMinApplyAmount()).append(",修改后=").append(expensiveGoods.getMinApplyAmount()).append(";"); + } + if((origineDG.getMinStorage() == null ? 0 : origineDG.getMinStorage().intValue()) != (expensiveGoods.getMinStorage() == null ? 0 : expensiveGoods.getMinStorage().intValue())){ + modifyContent.append("MinStorage属性修改前=").append(origineDG.getMinStorage()).append(",修改后=").append(expensiveGoods.getMinStorage()).append(";"); + } + if(!StringUtils.equals(origineDG.getPackageSpec(), expensiveGoods.getPackageSpec())){ + modifyContent.append("PackageSpec属性修改前=").append(origineDG.getPackageSpec()).append(",修改后=").append(expensiveGoods.getPackageSpec()).append(";"); + } + if(!StringUtils.equals(origineDG.getPrintInLabel(), expensiveGoods.getPrintInLabel())){ + modifyContent.append("PrintInLabel属性修改前=").append(origineDG.getPrintInLabel()).append(",修改后=").append(expensiveGoods.getPrintInLabel()).append(";"); + } + if(!StringUtils.equals(origineDG.getSpecification(), expensiveGoods.getSpecification())){ + modifyContent.append("Specification属性修改前=").append(origineDG.getSpecification()).append(",修改后=").append(expensiveGoods.getSpecification()).append(";"); + } + + if(!StringUtils.equals(origineDG.getType(), expensiveGoods.getType())){ + modifyContent.append("Type属性修改前=").append(origineDG.getType()).append(",修改后=").append(expensiveGoods.getType()).append(";"); + } + if(!StringUtils.equals(origineDG.getUnit(), expensiveGoods.getUnit())){ + modifyContent.append("Unit属性修改前=").append(origineDG.getUnit()).append(",修改后=").append(expensiveGoods.getUnit()).append(";"); + } + + if(!StringUtils.equals(origineDG.getNotInventoryDeptCode(), expensiveGoods.getNotInventoryDeptCode())){ + modifyContent.append("NotInventoryDeptCode属性修改前=").append(origineDG.getNotInventoryDeptCode()).append(",修改后=").append(expensiveGoods.getNotInventoryDeptCode()).append(";"); + } + if((origineDG.getReferencePrice() == null ? 0 : origineDG.getReferencePrice().doubleValue()) != (expensiveGoods.getReferencePrice() == null ? 0 : expensiveGoods.getReferencePrice().doubleValue())){ + modifyContent.append("ReferencePrice属性修改前=").append(origineDG.getReferencePrice()).append(",修改后=").append(expensiveGoods.getReferencePrice()).append(";"); + } + + if((origineDG.getMaxApplyAmount() == null ? 0 : origineDG.getMaxApplyAmount().doubleValue()) != (expensiveGoods.getMaxApplyAmount() == null ? 0 : expensiveGoods.getMaxApplyAmount().doubleValue())){ + modifyContent.append("MaxApplyAmount属性修改前=").append(origineDG.getMaxApplyAmount()).append(",修改后=").append(expensiveGoods.getMaxApplyAmount()).append(";"); + } + + if((origineDG.getSequence() == null ? 0 : origineDG.getSequence().intValue()) != (expensiveGoods.getSequence() == null ? 0 : expensiveGoods.getSequence().intValue())){ + modifyContent.append("Sequence属性修改前=").append(origineDG.getSequence()).append(",修改后=").append(expensiveGoods.getSequence()).append(";"); + } + + return modifyContent.toString(); + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/RegistrationCertification.java =================================================================== diff -u -r21539 -r22341 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/RegistrationCertification.java (.../RegistrationCertification.java) (revision 21539) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/RegistrationCertification.java (.../RegistrationCertification.java) (revision 22341) @@ -58,7 +58,7 @@ */ public String isUploadImage; - @JsonIgnore +// @JsonIgnore private ExpensiveGoodsSupplier expensiveGoodsSupplier; @Id