Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r16033 -r16053 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 16033) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 16053) @@ -110,6 +110,7 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.vo.TousseItemVo; +import com.forgon.log.service.LogManager; import com.forgon.security.model.User; import com.forgon.security.service.UserManager; import com.forgon.serialnumber.model.SerialNum; @@ -188,6 +189,8 @@ private UserManager userManager; + private LogManager appLogManager; + public void setDbConnection(InitDbConnection dbConnection) { this.dbConnection = dbConnection; } @@ -263,6 +266,10 @@ this.userManager = userManager; } + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + @Override public void saveInvoice(Invoice invoice) { invoice.setSpelling(GB2Alpha.string2Alpha(invoice.getDepart())); @@ -2861,6 +2868,7 @@ if(wareHouse == null){ throw new RuntimeException("未找到发货仓库!"); } + JSONArray jsonInvoiceArray = new JSONArray(); //发货仓库减库存列表 List allSourceStocks = new LinkedList(); //收货仓库加库存列表 @@ -2879,7 +2887,25 @@ allTargetStocks.addAll(targetstocks); //将器械包的仓库设置为目标仓库 tousseInstanceManager.setToDefaultWareHouse(entry.getValue(), entry.getKey().getDepartCoding()); + + Invoice invoice = entry.getKey(); + JSONObject invoiceObj = new JSONObject(); + invoiceObj.put("id", invoice.getId()); + + JSONArray tousseObjs = new JSONArray(); + Collection tousseList = entry.getValue(); + if(tousseList != null){ + for (TousseInstance tousseInstance : tousseList) { + JSONObject tousseObj = new JSONObject(); + tousseObj.put("barcode", tousseInstance.getBarcode()); + tousseObjs.add(tousseObj); + } + } + invoiceObj.put("tousses", tousseObjs); + jsonInvoiceArray.add(invoiceObj); } + + appLogManager.saveLog(AcegiHelper.getLoginUser(), "发货", "发货单明细", jsonInvoiceArray.toString()); try { if(CollectionUtils.isNotEmpty(allSourceStocks)){ goodsStockManager.saveOrUpdateGoodsStock(allSourceStocks, GoodsStockManager.MODE_OUTSTOCK);