Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r35530 -r35551 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 35530) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 35551) @@ -3383,6 +3383,8 @@ //器械包实例条码,如果扫描的器械包实例或标识牌实例条码,则需要返回相应的器械包实例条码(QYSRMYY-54) String tousseInstanceBarcode = null; + //是否为固定条码(前提是条码所对应的对象为器械包实例) + Boolean isTousseFixedBarcode = Boolean.FALSE; TousseDefinition tousseDefinition = null; if(barcodeDevice instanceof IDCardInstance){ //标识牌条码 @@ -3403,7 +3405,12 @@ //包实例条码/固定条码 TousseInstance tousseInstance = (TousseInstance) barcodeDevice; tousseDefinition = tousseInstance.getTousseDefinition(); - tousseInstanceBarcode = tousseInstance.getBarcode(); + //定义一个变量临时过渡一下,防止直接赋值出现赋值错误的情况 + Boolean tousseFixedBarcode = tousseInstance.getTousseFixedBarcode(); + isTousseFixedBarcode = tousseFixedBarcode; + if(BooleanUtils.isNotTrue(isTousseFixedBarcode)){ + tousseInstanceBarcode = tousseInstance.getBarcode(); + } }else{ throw new SystemException(errorBarcodeMessage); } @@ -3498,7 +3505,7 @@ }else{ throw new SystemException("【" + invoicePlan.getType() + "】不允许添加新的物品,只能回收申请单中的物品!"); } - return buildTousseDefinitionJson(tousseDefinition,tousseInstanceBarcode); + return buildTousseDefinitionJson(tousseDefinition,tousseInstanceBarcode,isTousseFixedBarcode); } } @@ -3583,9 +3590,10 @@ * ,applyEntireTousse:"是否整包申请",materialInstancesJsonArray:"材料清单json"} * @param tousseDefinition 器械包定义 * @param tousseInstanceBarcode 包实例条码 + * @param isTousseFixedBarcode 是否为固定条码 * @return */ - private JSONObject buildTousseDefinitionJson(TousseDefinition tousseDefinition,String tousseInstanceBarcode) { + private JSONObject buildTousseDefinitionJson(TousseDefinition tousseDefinition,String tousseInstanceBarcode,Boolean isTousseFixedBarcode) { JSONObject result = JSONUtil.buildJsonObject(true); result.put("type", BarcodeDevice.BARCODE_TYPE_PACKAGE); JSONObject data = new JSONObject(); @@ -3596,6 +3604,7 @@ data.put("defineId", tousseDefinition.getId()); data.put("type", tousseDefinition.getTousseType()); data.put("applyEntireTousse", tousseDefinition.getIsApplyEntireTousse()); + data.put("isTousseFixedBarcode",BooleanUtils.isTrue(isTousseFixedBarcode)); data.put("materialInstancesJsonArray", tousseDefinition.getMaterialInstancesJsonArray()); result.put("data", data); return result; Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.33_20230406_v4_1_6p_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json =================================================================== diff -u -r35539 -r35551 --- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 35539) +++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 35551) @@ -3,5 +3,5 @@ "version":"4.7.33", "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.33_20230403_v4_1_release.apk", "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.33_20230403_v4_1_nologo_release.apk", - "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.33_20230403_v4_1_6p_release.apk", + "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.33_20230406_v4_1_6p_release.apk", } \ No newline at end of file