Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r17400 -r17557 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17400) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17557) @@ -117,6 +117,7 @@ import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager; import com.forgon.disinfectsystem.tousseitem.service.TousseItemUtils; import com.forgon.disinfectsystem.vo.TousseItemVo; +import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.security.model.User; import com.forgon.security.service.UserManager; @@ -1210,7 +1211,7 @@ } invoiceLog.put("invoiceItems", invoiceItemsLogInfo); // 记录发货提交的条码和数量 - appLogManager.saveLog(AcegiHelper.getLoginUser(), "发货", "发货提交数据", invoiceLog.toString()); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVOICE, "发货提交数据", invoiceLog.toString()); return submitInvoiceItems; } @@ -3101,7 +3102,7 @@ jsonInvoiceArray.add(invoiceObj); } - appLogManager.saveLog(AcegiHelper.getLoginUser(), "发货", "发货单明细", jsonInvoiceArray.toString()); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVOICE, "发货单明细", jsonInvoiceArray.toString()); try { if(CollectionUtils.isNotEmpty(allSourceStocks)){ goodsStockManager.saveOrUpdateGoodsStockForInvoice(submitInvoiceContext.getAllGoodsStocksInDB(), @@ -3801,10 +3802,10 @@ } private void logScannedTousse(JsonObject dataJSONObject){ - appLogManager.saveLog(AcegiHelper.getLoginUser(), "发货", "发货扫描数据", dataJSONObject.toString()); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVOICE, "发货扫描数据", dataJSONObject.toString()); } private void logScannedTousses(JsonArray datasJSONArray){ - appLogManager.saveLog(AcegiHelper.getLoginUser(), "发货", "发货扫描数据", datasJSONArray.toString()); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVOICE, "发货扫描数据", datasJSONArray.toString()); } /** * 根据固定条码的包实例获取能发货的包实例