Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r36705 -r36735 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 36705) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 36735) @@ -2668,7 +2668,6 @@ params.put("storageLocationId", storageLocationId); params.put("storageLocationAddr", storageLocationAddr); - params.put("clientType", "PC"); //申请日期 String applyDate = StrutsParamUtils.getPraramValue("applyDate", ""); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java =================================================================== diff -u -r36705 -r36735 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java (.../SubmitInvoiceContext.java) (revision 36705) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java (.../SubmitInvoiceContext.java) (revision 36735) @@ -234,11 +234,6 @@ */ private String storageLocationAddr; - /** - * 客户端类型:PC/PDA - */ - private String clientType; - public List getAllGoodsStocksInDB() { return allGoodsStocksInDB; } @@ -737,12 +732,4 @@ this.storageLocationAddr = storageLocationAddr; } - public String getClientType() { - return clientType; - } - - public void setClientType(String clientType) { - this.clientType = clientType; - } - } Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r36729 -r36735 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 36729) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 36735) @@ -2835,9 +2835,6 @@ if(!StringUtils.equals(submitInvoiceContext.getInvoiceType(), Invoice.TYPE_OPERATION_RESERVATION)){ return; } - if(!StringUtils.equals(submitInvoiceContext.getClientType(), "PC")){ - return; - } boolean enableOperationReservationShippedToTraysOfKardexContainer = ConfigUtils.getSystemSetConfigByNameBool("enableOperationReservationShippedToTraysOfKardexContainer"); boolean enableWarehousePositionModuleInterfaceWithKardexContainer = ConfigUtils.getSystemSetConfigByNameBool("enableWarehousePositionModuleInterfaceWithKardexContainer"); if(!enableOperationReservationShippedToTraysOfKardexContainer @@ -2852,12 +2849,10 @@ //storageLocationId = 451878l; String storageLocationAddr = submitInvoiceContext.getStorageLocationAddr(); //storageLocationAddr = "s-01"; - if(!DatabaseUtil.isPoIdValid(storageLocationId)){ - throw new SystemException("托盘不能为空!"); + if(!DatabaseUtil.isPoIdValid(storageLocationId) + || StringUtils.isBlank(storageLocationAddr)){ + return; } - if(StringUtils.isBlank(storageLocationAddr)){ - throw new SystemException("开口不能为空!"); - } tousseInstanceManager.batchPutTousseInstanceIntoKardexStorageLoaction(invoiceTousseInstanceMap, storageLocationId, storageLocationAddr, orgUnitCode); } @@ -3210,7 +3205,6 @@ submitInvoiceContext.setStorageLocationAddr(storageLocationAddr); //submitInvoiceContext.setKardexContainerHost(kardexContainerHost); //submitInvoiceContext.setKardexContainerPort(KardexContainerPort); - submitInvoiceContext.setClientType(JSONUtil.optString(params, "clientType", "")); JSONArray jsonArrayInvoiceItems = params.optJSONArray("invoiceItems"); //校验限制发货科室的器械包是否为来自该科室