Index: ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/InventoryStockWebServiceImpl.java
===================================================================
diff -u -r23639 -r24018
--- ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/InventoryStockWebServiceImpl.java (.../InventoryStockWebServiceImpl.java) (revision 23639)
+++ ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/InventoryStockWebServiceImpl.java (.../InventoryStockWebServiceImpl.java) (revision 24018)
@@ -18,7 +18,6 @@
import com.forgon.directory.model.OrgUnit;
import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
import com.forgon.disinfectsystem.inventorymanagement.gdsy.dao.InventoryDao;
-import com.forgon.disinfectsystem.inventorymanagement.gdsy.dao.WriteBackInventoryDao;
import com.forgon.disinfectsystem.inventorymanagement.model.StorageEntry;
import com.forgon.disinfectsystem.inventorymanagement.service.InventoryManager;
import com.forgon.disinfectsystem.webservice.helper.WebServiceClientHelper;
@@ -39,40 +38,22 @@
private JsonObject config;
+ @Autowired(required=false)
private InventoryDao inventoryDao;
- private WriteBackInventoryDao writeBackInventoryDao;
+ @Autowired(required=false)
private InventoryManager inventoryManager;
+ @Autowired(required=false)
private LogManager appLogManager;
@Autowired
private ObjectDao objectDao;
- public void setInventoryDao(InventoryDao inventoryDao) {
- this.inventoryDao = inventoryDao;
- }
- public void setWriteBackInventoryDao(WriteBackInventoryDao writeBackInventoryDao) {
- this.writeBackInventoryDao = writeBackInventoryDao;
- }
-
- public void setInventoryManager(InventoryManager inventoryManager) {
- this.inventoryManager = inventoryManager;
- }
public void setConfig(JsonObject config) {
this.config = config;
}
- public LogManager getAppLogManager() {
- if(appLogManager == null){
- appLogManager = (LogManager)SpringBeanManger.getBean("appLogManager");
- }
- return appLogManager;
- }
- public void setAppLogManager(LogManager appLogManager) {
- this.appLogManager = appLogManager;
- }
-
/**
* 日志信息
*/
@@ -109,12 +90,12 @@
*/
public String receiveInStorageData(String dataXml){
logger.debug("receiveInStorageData method invoking...dataXml="+dataXml);
- getAppLogManager().saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "物资推送入库,dataXml="+dataXml);
+ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "物资推送入库,dataXml="+dataXml);
String xmlResult = "";
if(running == true){
xmlResult += " 1 "+"接口正在运行处理中,请稍候再调用!"+" ";
- getAppLogManager().saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
+ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
return xmlResult;
}
running = true;
@@ -142,7 +123,7 @@
jsonObjectResult = inventoryManager.prepareSyncOutEntry(dataJson, storageEntrys);
}else{
xmlResult += " 1 物质发生的数量需要全部为正整数或全部为负整数 ";
- getAppLogManager().saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
+ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
return xmlResult;
}
//
@@ -162,20 +143,20 @@
//同步入库单/退库单
inventoryManager.syncStorageEntry_TRANS_REQUIRED(storageEntrys, WebServiceClientHelper.OPERATOR_HIS, entryType);
xmlResult += " 0 ";
- getAppLogManager().saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
+ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
}else{
xmlResult += " 1 未找到对应的入/退库单 ";
- getAppLogManager().saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
+ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
}
}else{
xmlResult += " 1 " + jsonObjectResult.get("error") + " ";
- getAppLogManager().saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
+ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult);
}
return xmlResult;
}catch (Exception e) {
e.printStackTrace();
xmlResult += " 1 服务器出错!"+e.getMessage()+" ";
- getAppLogManager().saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult + ",error=" + e);
+ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INVENTORYSYCN, Log.TYPE_ADD, "接口返回给物资系统,result="+xmlResult + ",error=" + e);
return xmlResult;
}finally{
running = false;
Index: ssts-web/src/main/resources/spring/projects/gdsy/webservice-cxf.xml
===================================================================
diff -u -r23822 -r24018
--- ssts-web/src/main/resources/spring/projects/gdsy/webservice-cxf.xml (.../webservice-cxf.xml) (revision 23822)
+++ ssts-web/src/main/resources/spring/projects/gdsy/webservice-cxf.xml (.../webservice-cxf.xml) (revision 24018)
@@ -10,38 +10,17 @@
-
-
+
-
-
-
-
- -->
-
-
+ implementor="#inventoryStockWebService" />
\ No newline at end of file