Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java =================================================================== diff -u -r17897 -r29054 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java (.../TousseTransitionPlanManagerImpl.java) (revision 17897) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java (.../TousseTransitionPlanManagerImpl.java) (revision 29054) @@ -141,8 +141,12 @@ } } - @Override - public List getWaitTransitionPlan(String orgUnitCodes) { + /** + * 获取待交接单 + * @param orgUnitCodes 交接单的申请科室,以','分隔,可以用于in语句中 + * @return + */ + private List getWaitTransitionPlan(String orgUnitCodes,int firstIndex,int pageSize) { String sql = " 1=1 "; if (StringUtils.isNotBlank(orgUnitCodes)) { // departCode字段为字符串，需要加单引号查询 @@ -158,13 +162,14 @@ } sql += " and po.status='" + TousseTransitionPlan.STATUS_WAIT_TRANSITION + "'"; sql += " order by po.departCode,po.createTime"; - return getByHql(sql); +// return getByHql(sql); + return objectDao.findByHql(String.format("from %s po where %s", TousseTransitionPlan.class.getSimpleName() , sql), firstIndex, pageSize); } @Override - public JSONArray getWaitTransitionPlanJson(String orgUnitCodes) { + public JSONArray getWaitTransitionPlanJson(String orgUnitCodes,int firstIndex,int pageSize) { JSONArray dataArray = new JSONArray(); - List transitionPlans = getWaitTransitionPlan(orgUnitCodes); + List transitionPlans = getWaitTransitionPlan(orgUnitCodes, firstIndex, pageSize); if(CollectionUtils.isNotEmpty(transitionPlans)){ List invoicePlanIds = transitionPlans.stream().map(p->p.getInvoicePlanId()).collect(Collectors.toList()); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java =================================================================== diff -u -r17849 -r29054 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java (.../TousseTransitionPlanManager.java) (revision 17849) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java (.../TousseTransitionPlanManager.java) (revision 29054) @@ -30,18 +30,13 @@ * @param invoicePlanId */ public void recycled(Long invoicePlanId); + /** - * 获取待交接单 - * @param orgUnitCodes 交接单的申请科室,以','分隔,可以用于in语句中 - * @return - */ - public List getWaitTransitionPlan(String orgUnitCodes); - /** * 获取待交接单.以json数组返回 * @param orgUnitCodes * @return */ - public JSONArray getWaitTransitionPlanJson(String orgUnitCodes); + public JSONArray getWaitTransitionPlanJson(String orgUnitCodes,int firstIndex,int pageSize); /** * * @param tousseTransitionPlanId 器械交接单的id Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json =================================================================== diff -u -r28881 -r29054 --- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 28881) +++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 29054) @@ -1,7 +1,7 @@ { "success":"true", - "version":"4.7.02", - "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_release.apk", - "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_nologo_release.apk", - "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_6p_release.apk", + "version":"4.7.03", + "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_release.apk", + "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_nologo_release.apk", + "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_6p_release.apk", } \ No newline at end of file Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_nologo_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_6p_release.apk =================================================================== diff -u Binary files differ Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r28984 -r29054 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 28984) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 29054) @@ -893,7 +893,11 @@ } } } - JSONObject json = JSONUtil.buildJsonObject(true,tousseTransitionPlanManager.getWaitTransitionPlanJson(orgUntiCodes)); + //第几条记录。从0开始 + int firstIndex = params.optInt("first"); + //每页记录数 + int maxResultCount = params.optInt("count"); + JSONObject json = JSONUtil.buildJsonObject(true,tousseTransitionPlanManager.getWaitTransitionPlanJson(orgUntiCodes,firstIndex,maxResultCount)); json.put("groups", groupArray); return json.toString(); } @@ -1234,11 +1238,16 @@ tousseInstance.getForeignTousseApp_id()); } }*/ + //器械包所在位置(有二次发货取二次发货的值,否则取一次发货的位置) + String location = StringUtils.isNotBlank(tousseInstance.getLocation_2()) ? tousseInstance.getLocation_2() : tousseInstance.getLocation(); + String locationForDisplay = StringUtils.isNotBlank(tousseInstance.getLocationForDisplay2()) ? tousseInstance.getLocationForDisplay2() : tousseInstance.getLocationForDisplay(); JSONObject dataJSONObject = new JSONObject(); dataJSONObject.put("tousseName", tousseName); dataJSONObject.put("barcode", tousseInstance.getBarcode()); dataJSONObject.put("fluctuationPrice", tousseInstance.getFluctuationPrice()); dataJSONObject.put("price", tousseInstance.getPrice()); + dataJSONObject.put("location", location); + dataJSONObject.put("locationForDisplay", locationForDisplay); return dataJSONObject; } @@ -3692,16 +3701,17 @@ if (extraParam == null) return JSONUtil.buildErrorMsgJsonResult("缺失参数extraParam"); - final String depart = extraParam.optString("depart"); final String departCode = extraParam.optString("departCode"); + /*final String depart = extraParam.optString("depart"); Collection c1 = Arrays.asList(depart, departCode); Collection c2 = Arrays.asList(null, "", "null"); if (CollectionUtils.isNotEmpty(CollectionUtils.intersection(c1, c2))) - return JSONUtil.buildErrorMsgJsonResult("请先扫描退货科室的条码，或录入退货人信息"); + return JSONUtil.buildErrorMsgJsonResult("请先扫描退货科室的条码，或录入退货人信息");*/ - if(!StringUtils.equals(departCode, tousseInstance.getLocation())) + if(StringUtils.isNotBlank(departCode) && !StringUtils.equals(departCode, tousseInstance.getLocation())){ return JSONUtil.buildErrorMsgJsonResult("此器械包不属于" + extraParam.optString("depart")); - + } + return new JSONStringer().object().key("success").value(true) .key("barcode").value(barcode).key("type") .value("tousseInstance").key("data")