Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js =================================================================== diff -u -r27519 -r28946 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js (.../departmentAppTemplateForm.js) (revision 27519) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js (.../departmentAppTemplateForm.js) (revision 28946) @@ -38,11 +38,13 @@ var configGrid2 = top.Ext.getCmp('configGrid2').getStore(); for(var i= 0 ;i"; return str; @@ -262,10 +283,25 @@ dataIndex : 'diposableGoodsName', width:330 },{ + id : 'amount', + header : "数量", + dataIndex : 'amount', + width : 50, + editor : new top.Ext.form.NumberField({ + allowBlank : true, + allowDecimals:false, + allowNegative:false, + listeners : { + focus : function(thiz){ + thiz.selectText(); + } + } + }) + },{ id : 'sortNumber', header : "排序", dataIndex : 'sortNumber', - width : 40, + width : 50, menuDisabled : true, editor : new top.Ext.form.NumberField({ allowBlank : false, @@ -277,7 +313,7 @@ }) },{ id : 'deleteItem', - header:'删除操作', + header:'删除', renderer: function(v,p,record){ var str = ""; return str; @@ -293,12 +329,14 @@ var tousseItem = Ext.data.Record.create([{ name : 'id', name : 'tousseName', + name : 'amount', name : 'sortNumber' }]); var diposableGoodsConfig = Ext.data.Record.create([{ name : 'id', name : 'diposableGoodsName', + name : 'amount', name : 'sortNumber' }]); @@ -646,7 +684,7 @@ listeners : { specialkey : function(field, ee) { if (ee.getKey() == Ext.EventObject.ENTER) { - var n = top.Ext.getCmp('configGrid2').getStore().getCount();// 获得总行数 + /*var n = top.Ext.getCmp('configGrid2').getStore().getCount();// 获得总行数 var tousseId = top.Ext.getCmp('package').getValue(); var tousseName = top.Ext.getCmp('package').getRawValue(); if(isRepeat('configGrid2',tousseId) == false){ @@ -664,33 +702,36 @@ showResult(tousseName+"，已存在！"); } top.Ext.getCmp('package').setValue(""); - top.Ext.getCmp('package').setRawValue(""); + top.Ext.getCmp('package').setRawValue("");*/ + addTousseToTemplateGrid(); } } } },{ - text:'添加', - handler : function() { - var n = top.Ext.getCmp('configGrid2').getStore().getCount();// 获得总行数 - var tousseId = top.Ext.getCmp('package').getValue(); - var tousseName = top.Ext.getCmp('package').getRawValue(); - if(isRepeat('configGrid2',tousseId) == false){ - if(tousseId > 0){ - var p = new tousseItem({ - id : tousseId, - tousseName : tousseName, - sortNumber : (sortNum+1) - }); - top.Ext.getCmp('configGrid2').stopEditing();// 停止编辑 - tousseItemsStore.add(p);// 插入到最后一行 - sortNum++; + text:"数量:",hidden:true + },{ + xtype : 'numberfield', + id : 'tousseAmount', + name : 'tousseAmount', + style : 'text-align: left', + width : 70, + hidden:true, + maxValue: 9999, + minValue: 1, + allowNegative : false, + allowDecimals : false, + listeners : { + specialkey : function(field, ee) { + if (ee.getKey() == Ext.EventObject.ENTER) { + addTousseToTemplateGrid(); } - }else{ - showResult(tousseName+"，已存在！"); } - top.Ext.getCmp('package').setValue(""); - top.Ext.getCmp('package').setRawValue(""); } + },{ + text:'添加', + handler : function() { + addTousseToTemplateGrid(); + } }] })] }, { @@ -747,14 +788,16 @@ }, specialkey : function(field, ee) { if (ee.getKey() == Ext.EventObject.ENTER) { - var n = top.Ext.getCmp('configGrid3').getStore().getCount();// 获得总行数 + /*var n = top.Ext.getCmp('configGrid3').getStore().getCount();// 获得总行数 var diposableGoodsId = top.Ext.getCmp('goodsId').getValue(); var diposableGoodsName = top.Ext.getCmp('diposableGoods').getRawValue(); + var disposableGoodsAmount = top.Ext.getCmp('disposableGoodsAmount').getRawValue(); if(isRepeat('configGrid3',diposableGoodsId) == false){ if(diposableGoodsId > 0){ var p = new diposableGoodsConfig({ id : diposableGoodsId, diposableGoodsName : diposableGoodsName, + amount : disposableGoodsAmount, sortNumber : (sortNum2+1) }); top.Ext.getCmp('configGrid3').stopEditing();// 停止编辑 @@ -765,33 +808,36 @@ showResult(diposableGoodsName + "，已存在！"); } top.Ext.getCmp('diposableGoods').setValue(""); - top.Ext.getCmp('diposableGoods').setRawValue(""); + top.Ext.getCmp('diposableGoods').setRawValue("");*/ + addDisposableGoodsToTemplateGrid(); } } } },{ - text:'添加', - handler : function() { - var n = top.Ext.getCmp('configGrid3').getStore().getCount();// 获得总行数 - var diposableGoodsId = top.Ext.getCmp('goodsId').getValue(); - var diposableGoodsName = top.Ext.getCmp('diposableGoods').getRawValue(); - if(isRepeat('configGrid3',diposableGoodsId) == false){ - if(diposableGoodsId > 0){ - var p = new diposableGoodsConfig({ - id : diposableGoodsId, - diposableGoodsName : diposableGoodsName, - sortNumber : (sortNum2+1) - }); - top.Ext.getCmp('configGrid3').stopEditing(); - diposableGoodsItemsStore.add(p); - sortNum2++; + text:"数量:",hidden:true + },{ + xtype : 'numberfield', + id : 'disposableGoodsAmount', + name : 'disposableGoodsAmount', + style : 'text-align: left', + width : 70, + hidden:true, + maxValue: 9999, + minValue: 1, + allowNegative : false, + allowDecimals : false, + listeners : { + specialkey : function(field, ee) { + if (ee.getKey() == Ext.EventObject.ENTER) { + addDisposableGoodsToTemplateGrid(); } - }else{ - showResult(diposableGoodsName + "，已存在！"); } - top.Ext.getCmp('diposableGoods').setValue(""); - top.Ext.getCmp('diposableGoods').setRawValue(""); } + },{ + text:'添加', + handler : function() { + addDisposableGoodsToTemplateGrid(); + } }] })] }] @@ -812,7 +858,7 @@ id : 'sterilizerWin', layout : 'fit', title : '科室申领模板信息', - width : 900, + width : 1000, border : false, modal : true, autoHeight : true, @@ -858,9 +904,65 @@ }); } + + /** + * 添加器械包至器械包模板表格 + */ + function addTousseToTemplateGrid(){ + var n = top.Ext.getCmp('configGrid2').getStore().getCount();// 获得总行数 + var tousseId = top.Ext.getCmp('package').getValue(); + var tousseName = top.Ext.getCmp('package').getRawValue(); + var tousseAmount = top.Ext.getCmp('tousseAmount').getValue(); + if(isRepeat('configGrid2',tousseId) == false){ + if(tousseId > 0){ + var p = new tousseItem({ + id : tousseId, + tousseName : tousseName, + amount : tousseAmount, + sortNumber : (sortNum+1) + }); + top.Ext.getCmp('configGrid2').stopEditing();// 停止编辑 + tousseItemsStore.add(p);// 插入到最后一行 + sortNum++; + } + }else{ + showResult(tousseName+"，已存在！"); + } + top.Ext.getCmp('package').setValue(""); + top.Ext.getCmp('package').setRawValue(""); + top.Ext.getCmp('tousseAmount').setValue(""); + } + + + /** + * 将选择的一次性物品添加至一次性物品模板表格 + */ + function addDisposableGoodsToTemplateGrid(){ + var n = top.Ext.getCmp('configGrid3').getStore().getCount();// 获得总行数 + var diposableGoodsId = top.Ext.getCmp('goodsId').getValue(); + var diposableGoodsName = top.Ext.getCmp('diposableGoods').getRawValue(); + var disposableGoodsAmount = top.Ext.getCmp('disposableGoodsAmount').getRawValue(); + if(isRepeat('configGrid3',diposableGoodsId) == false){ + if(diposableGoodsId > 0){ + var p = new diposableGoodsConfig({ + id : diposableGoodsId, + diposableGoodsName : diposableGoodsName, + amount : disposableGoodsAmount, + sortNumber : (sortNum2+1) + }); + top.Ext.getCmp('configGrid3').stopEditing(); + diposableGoodsItemsStore.add(p); + sortNum2++; + } + }else{ + showResult(diposableGoodsName + "，已存在！"); + } + top.Ext.getCmp('diposableGoods').setValue(""); + top.Ext.getCmp('diposableGoods').setRawValue(""); + top.Ext.getCmp('disposableGoodsAmount').setRawValue(); + } } - function validateAndSubmit(){ var departmentIds = getApplicationDepartmentIds();//申请部门 Ext.Ajax.request({ Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java =================================================================== diff -u -r28154 -r28946 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java (.../DepartmentAppTemplateManagerImpl.java) (revision 28154) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java (.../DepartmentAppTemplateManagerImpl.java) (revision 28946) @@ -226,15 +226,16 @@ return items; } - - + @Override public void tousseDefinitionTemplateItems2JsonArray(JSONArray jsonArray, List items, double toussePriceFloatPercent) { for (TousseDefinitionTemplateItem item : items){ if(TousseDefinition.STR_YES.equals(item.getTousseDefinition().getIsDisable())){ continue; } JSONObject json = tousseItem2Json(null, item.getTousseDefinition(), toussePriceFloatPercent); + //设置模板里的默认数量 + json.put("count", item.getAmount()); if (jsonArray.contains(json) == false){ jsonArray.add(json); } @@ -281,6 +282,8 @@ json.put("minUnit", disposableGoods.getUnit()); json.put("transferScale", disposableGoods.getTransferScale()); } + //设置模板里的默认数量 + json.put("count", item.getAmount()); if (jsonArray.contains(json) == false){ jsonArray.add(json); } @@ -311,7 +314,8 @@ diposableTemplateItems2JsonArray(null, jsonArray, items, floatPercent, null); } } - + + @Override public JSONObject tousseItem2Json(TousseItem tousseItem, TousseDefinition tdOfTousseItem, double toussePriceFloatPercent) { JSONObject json = new JSONObject(); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java =================================================================== diff -u -r28154 -r28946 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java (.../DepartmentAppTemplateAction.java) (revision 28154) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java (.../DepartmentAppTemplateAction.java) (revision 28946) @@ -292,16 +292,25 @@ String [] tousseIdsArry = tousseIds.split(","); for (String tousseId : tousseIdsArry) { String [] tousseItem = tousseId.split(";"); - TousseDefinition toussedefinition = tousseDefinitionManager.get(tousseItem[0]); + String tousseDefinitionId = tousseItem[0]; + TousseDefinition toussedefinition = tousseDefinitionManager.get(tousseDefinitionId); TousseDefinitionTemplateItem oldTousseItem = toussedeMap.get(toussedefinition.getId()); + String sortNumber = tousseItem[1]; + String amount = tousseItem[2]; //原有的 if(toussedefinition != null && oldTousseItem != null && toussedefinition.getId().equals(oldTousseItem.getTousseDefinition().getId())){ - oldTousseItem.setSortNumber(Integer.parseInt(tousseItem[1])); + oldTousseItem.setSortNumber(Integer.parseInt(sortNumber)); + if(StringUtils.isNotBlank(amount) && StringUtils.isNumeric(amount) && !StringUtils.equals(amount, "0")){ + oldTousseItem.setAmount(Integer.parseInt(amount)); + } toussedefinitionTemplate.add(oldTousseItem); }else{//新加的 TousseDefinitionTemplateItem tempalteItem = new TousseDefinitionTemplateItem(); tempalteItem.setTousseDefinition(toussedefinition); - tempalteItem.setSortNumber(Integer.parseInt(tousseItem[1])); + tempalteItem.setSortNumber(Integer.parseInt(sortNumber)); + if(StringUtils.isNotBlank(amount) && StringUtils.isNumeric(amount) && !StringUtils.equals(amount, "0")){ + tempalteItem.setAmount(Integer.parseInt(amount)); + } toussedefinitionTemplate.add(tempalteItem); } } @@ -318,15 +327,24 @@ String [] diposableGoodsdsArry = diposableGoodsIds.split(","); for (String diposableGoodsId : diposableGoodsdsArry) { String [] diposableGoodsItemArray = diposableGoodsId.split(";"); - DisposableGoods diposableGoods = diposableGoodsManager.get(diposableGoodsItemArray[0]); + String disposableGoodsId = diposableGoodsItemArray[0]; + String sortNumber = diposableGoodsItemArray[1]; + String amount = diposableGoodsItemArray[2]; + DisposableGoods diposableGoods = diposableGoodsManager.get(disposableGoodsId); DiposableGoodsTemplateItem oldDiposalbeGoodsItem = diposableGoodsMap.get(diposableGoods.getId()); if(diposableGoods != null && oldDiposalbeGoodsItem != null && diposableGoods.getId().equals(oldDiposalbeGoodsItem.getApplicationDiposableGoods().getId())){ - oldDiposalbeGoodsItem.setSortNumber(Integer.parseInt(diposableGoodsItemArray[1])); + oldDiposalbeGoodsItem.setSortNumber(Integer.parseInt(sortNumber)); + if(StringUtils.isNotBlank(amount) && StringUtils.isNumeric(amount) && !StringUtils.equals(amount, "0")){ + oldDiposalbeGoodsItem.setAmount(Integer.parseInt(amount)); + } diposableGoodsList.add(oldDiposalbeGoodsItem); }else{ DiposableGoodsTemplateItem tempalteItem = new DiposableGoodsTemplateItem(); tempalteItem.setApplicationDiposableGoods(diposableGoods); - tempalteItem.setSortNumber(Integer.parseInt(diposableGoodsItemArray[1])); + tempalteItem.setSortNumber(Integer.parseInt(sortNumber)); + if(StringUtils.isNotBlank(amount) && StringUtils.isNumeric(amount) && !StringUtils.equals(amount, "0")){ + tempalteItem.setAmount(Integer.parseInt(amount)); + } diposableGoodsList.add(tempalteItem); } } @@ -466,7 +484,10 @@ sb.append(","); } sb.append("['").append(td.getTousseDefinition().getId()).append("','") - .append(td.getTousseDefinition().getName()).append("','"+td.getSortNumber()+"']"); + .append(td.getTousseDefinition().getName()) + .append("','"+ (td.getAmount() == null ? "" : td.getAmount()) +"'") + .append(",'"+td.getSortNumber()+"'") + .append("]"); } } @@ -486,7 +507,9 @@ dgName+= "[" + dg.getApplicationDiposableGoods().getSpecification() + "]"; } sb.append("['").append(dg.getApplicationDiposableGoods().getId()).append("','") - .append(dgName).append("','"+dg.getSortNumber()+"']"); + .append(dgName).append("','"+ (dg.getAmount() == null ? "" : dg.getAmount()) +"'") + .append(",'"+dg.getSortNumber()+"'") + .append("]");; } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/TousseDefinitionTemplateItem.java =================================================================== diff -u -r23492 -r28946 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/TousseDefinitionTemplateItem.java (.../TousseDefinitionTemplateItem.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/TousseDefinitionTemplateItem.java (.../TousseDefinitionTemplateItem.java) (revision 28946) @@ -40,6 +40,12 @@ private DepartmentAppTemplate departmentAppTemplate; + /** + * 数量,用于填写申请单时,对应到申请物品的申请数量列做为初始默认值。值只能为空或正整数 + * GDSZYY-15 科室申领模板增加物品默认申请数量的功能 + */ + private Integer amount; + @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -68,7 +74,14 @@ this.sortNumber = sortNumber; } + public Integer getAmount() { + return amount; + } + public void setAmount(Integer amount) { + this.amount = amount; + } + @ManyToOne @JoinColumn(name = "appTemplate_id") public DepartmentAppTemplate getDepartmentAppTemplate() { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/DiposableGoodsTemplateItem.java =================================================================== diff -u -r23492 -r28946 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/DiposableGoodsTemplateItem.java (.../DiposableGoodsTemplateItem.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/DiposableGoodsTemplateItem.java (.../DiposableGoodsTemplateItem.java) (revision 28946) @@ -1,8 +1,10 @@ package com.forgon.disinfectsystem.entity.basedatamanager.departmentapplicationtemplate; import javax.persistence.Entity; + import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -32,6 +34,12 @@ private Integer sortNumber;//排序号码 + /** + * 数量,用于填写申请单时,对应到申请物品的申请数量列做为初始默认值。值只能为空或正整数 + * GDSZYY-15 科室申领模板增加物品默认申请数量的功能 + */ + private Integer amount; + private DepartmentAppTemplate departmentAppTemplate; @Id @@ -63,6 +71,14 @@ this.sortNumber = sortNumber; } + public Integer getAmount() { + return amount; + } + + public void setAmount(Integer amount) { + this.amount = amount; + } + @ManyToOne @JoinColumn(name = "appTemplate_id") public DepartmentAppTemplate getDepartmentAppTemplate() { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r28155 -r28946 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 28155) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 28946) @@ -434,14 +434,17 @@ // 模板Id String templateId = StrutsParamUtils.getPraramValue("templateId", null); templateId = DatabaseUtil.isPoIdValid(templateId) ? templateId : null; - // 申请单Id + // 申请单Id,如果申请单id为空则表示新建申请单,加载模板时需要加载对应物品的默认申请数量.否则不加载否认申请数量(GDSZYY-15 科室申领模板增加物品默认申请数量的功能) String applicationId = StrutsParamUtils.getPraramValue("id", null); + //是否需要清空模板物品的默认数量(打开已有申请单的场景) + boolean needClearTemplateDefaultAmount = false; StringBuffer leftStoreJson = new StringBuffer(); StringBuffer rightStoreJson = new StringBuffer(); // 申请单申请的物品（注意key的取值：如果是“消毒物品”=类型;名称，其他的物品=类型;id） Map applicationItemMap = new HashMap(); InvoicePlan application = null; if (StringUtils.isNotBlank(applicationId)) { + needClearTemplateDefaultAmount = true; application = invoicePlanManager.get(applicationId); if (application != null) { for (TousseItem tousseItem : application.getApplicationItems()) { @@ -454,6 +457,8 @@ } applicationItemMap.put(key, tousseItem); } + }else{ + //此处应该还要有错误输出、返回 } } boolean isUpdateStatus = true;// 是否更新借物单状态为已归还 @@ -508,8 +513,8 @@ departmentAppTemplateManager.diposableTemplateItems2JsonArray(handleDepartCoding, diposableJsonArray, diposableGoodsItems,disposableFloatPercent,null); } - updateItemsApplyInfo(applicationItemMap, toussesJsonArray); - updateItemsApplyInfo(applicationItemMap, diposableJsonArray); + updateItemsApplyInfo(applicationItemMap, toussesJsonArray, needClearTemplateDefaultAmount); + updateItemsApplyInfo(applicationItemMap, diposableJsonArray, needClearTemplateDefaultAmount); appendJsonString(leftStoreJson, toussesJsonArray.toString()); appendJsonString(rightStoreJson, diposableJsonArray.toString()); @@ -529,7 +534,7 @@ JSONArray diposableJsonArray = new JSONArray(); departmentAppTemplateManager.diposableTemplateItems2JsonArray(handleDepartCoding, diposableJsonArray, diposableTemplate.getDiposableGoodsTemplateItems(), disposableFloatPercent, specifyDisposableTypes); - updateItemsApplyInfo(applicationItemMap, diposableJsonArray); + updateItemsApplyInfo(applicationItemMap, diposableJsonArray, needClearTemplateDefaultAmount); appendJsonString(rightStoreJson, diposableJsonArray.toString()); } } @@ -544,7 +549,7 @@ JSONArray toussesJsonArray = new JSONArray(); List tempList = tousseDefinitionHelper.filterGoodByType(template, goodType); departmentAppTemplateManager.tousseDefinitionTemplateItems2JsonArray(toussesJsonArray, tempList, tousseDefinitionFloatPercent); - updateItemsApplyInfo(applicationItemMap, toussesJsonArray); + updateItemsApplyInfo(applicationItemMap, toussesJsonArray, needClearTemplateDefaultAmount); if (DepartmentAppTemplate.TEMPLATE_TYPE_TOUSSE1.equals(templateType) && tousseApplicationFormGridSplit) { appendJsonString(leftStoreJson, toussesJsonArray.toString()); @@ -567,7 +572,7 @@ } } - updateItemsApplyInfo(applicationItemMap, diposableJsonArray); + updateItemsApplyInfo(applicationItemMap, diposableJsonArray, needClearTemplateDefaultAmount); appendJsonString(rightStoreJson, diposableJsonArray.toString()); } } else { @@ -583,7 +588,7 @@ //按照sortNumber重新排序 departmentAppTemplateManager.sortTousseTemplateItems(tempList); departmentAppTemplateManager.tousseDefinitionTemplateItems2JsonArray(toussesJsonArray, tempList, tousseDefinitionFloatPercent); - updateItemsApplyInfo(applicationItemMap, toussesJsonArray); + updateItemsApplyInfo(applicationItemMap, toussesJsonArray, needClearTemplateDefaultAmount); if (DepartmentAppTemplate.TEMPLATE_TYPE_TOUSSE1.equals(templateType) && tousseApplicationFormGridSplit) { appendJsonString(leftStoreJson, toussesJsonArray.toString()); @@ -736,13 +741,14 @@ * 遍历所定义的模板的物品的toussesJsonArray，查找其中的物品是否有已申领的物品，如果有，则从toussesJsonArray删除. * @param applicationItemMap 申请项的Map<如果是“消毒物品”=类型;名称，其他的物品=类型;id,申请项> * @param toussesJsonArray 科室申领模版配置的物品集合 + * @param needClearTemplateDefaultAmount 是否需要清空模板物品的默认数量(打开已有申请单的场景) */ private void updateItemsApplyInfo( Map applicationItemMap, - JSONArray toussesJsonArray) { - if (applicationItemMap.size() <= 0) { + JSONArray toussesJsonArray,boolean needClearTemplateDefaultAmount) { + /*if (applicationItemMap.size() <= 0) { return; - } + }*/ JSONArray applicationToussesJsonArray = new JSONArray(); for (int i = 0; i < toussesJsonArray.size(); i++) { JSONObject obj = toussesJsonArray.getJSONObject(i); @@ -751,6 +757,9 @@ String goodsId = obj.optString("tousseDefinitionID"); String tousseType = obj.optString("tousseType"); String goodsName = obj.optString("name"); + if(needClearTemplateDefaultAmount){ + obj.remove("count"); + } //注意key的取值：如果是“消毒物品”=类型;名称，其他的物品=类型;id