Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r13300 -r13393 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 13300) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 13393) @@ -15,6 +15,8 @@ import java.util.Map; import java.util.Set; +import javax.servlet.http.HttpServletResponse; + import net.sf.json.JSONArray; import net.sf.json.JSONException; import net.sf.json.JSONNull; @@ -117,11 +119,14 @@ import com.forgon.security.userdetails.UserContainsSessionUser; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; +import com.forgon.systemsetting.model.HttpOption; +import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.tools.FileSystemHelper; import com.forgon.tools.MathTools; import com.forgon.tools.Path; 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.hibernate.ObjectDao; import com.forgon.tools.json.DateJsonValueProcessor; @@ -172,6 +177,7 @@ private RecyclingApplicationManager recyclingApplicationManager; private PackingManager packingManager; private WareHouseManager wareHouseManager; + private HttpOptionManager httpOptionManager; public void setPackingManager(PackingManager packingManager) { @@ -221,6 +227,10 @@ this.wareHouseManager = wareHouseManager; } + public void setHttpOptionManager(HttpOptionManager httpOptionManager) { + this.httpOptionManager = httpOptionManager; + } + private final PasswordEncoder passwordEncoder = new Md5PasswordEncoder(); public void setReviewedBasketManager( @@ -1823,6 +1833,7 @@ JSONObject result = new JSONObject(); result.put("barcode", sterilisation.getBarcode()); result.put("name", sterilisation.getSterilisation()); + result.put("sterilizationPurpose", sterilisation.getSterilizationPurpose()); return result; } @@ -3012,4 +3023,14 @@ } return mobileClientInfo; } + /** + * 加载所有的灭菌目的 + * @param params + * @return + */ + public String loadSterilePurposes(JSONObject params){ + List list = httpOptionManager.getHttpOptionListById(HttpOption.SYSTEMSETTING_STERILIZATIONPURPOSE); + JSONArray array = JSONArray.fromObject(list); + return new JSONStringer().object().key("success").value(true).key("data").value(array).endObject().toString(); + } }