Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r37354 -r37355 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 37354) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 37355) @@ -5757,6 +5757,10 @@ */ public String submitChangePositionOrSign(JSONObject params){ String operation = params.optString("operation"); + //如果操作类型与所配置项的发货操作的配置的值一致时,将operation的值重置为"发货"-GDSRMYY-580 + if(StringUtils.equals(operation, getOperationInvoiceNameParseAliasNameOfSurgicalInstrumentsManagementFromConfigJs())){ + operation = com.forgon.disinfectsystem.common.Constants.OPERATION_INVOICE; + } if(TousseOperation.OPERATION_INVOICE.equals(operation)){ tousseInstanceManager.saveChangePosition(params); }else if(TousseOperation.OPERATION_SIGN.equals(operation)){ @@ -5772,6 +5776,7 @@ public String getInfoByBarcode_SurgicalStruments(JSONObject params) { String barcode = params.optString("barcode"); String operation = params.optString("operation"); + //如果操作类型与所配置项的发货操作的配置的值一致时,将operation的值重置为"发货"-GDSRMYY-580 if(StringUtils.equals(operation, getOperationInvoiceNameParseAliasNameOfSurgicalInstrumentsManagementFromConfigJs())){ operation = com.forgon.disinfectsystem.common.Constants.OPERATION_INVOICE; }