Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java =================================================================== diff -u -r27849 -r28144 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 27849) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 28144) @@ -76,6 +76,7 @@ import com.forgon.tools.json.JSONUtil; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; +import com.forgon.tools.util.ConfigUtils; import com.forgon.tools.util.PageUtil; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; @@ -919,6 +920,10 @@ if (StringTools.equals(StrutsParamUtils.getPraramValue("neddCustomDeliveryType", ""), "yes")) { list.add(createApplyTypeJSONObject(Invoice.TYPE_CUSTOM)); } + // 启用物品预约功能(ASSDGSZYY-77) + if (ConfigUtils.getSystemSetConfigByNameBool("enableGoodsReservateion", false)) { + list.add(createApplyTypeJSONObject(InvoicePlan.TYPE_GOODS_RESERVATION_FORM)); + } JSONObject result = new JSONObject(); result.put("totalCount", list.size()); result.put("data", list);