Merge branch 'master' of git@182.92.242.253:originstar/drp.git

src/main/java/com/originspark/drp/controllers/projects/costs/StockInCostController.java

@@ -3,9 +3,9 @@ package com.originspark.drp.controllers.projects.costs;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +26,7 @@ import com.originspark.drp.util.json.JsonUtils;
 @RequestMapping("stockInCost")
 public class StockInCostController extends BaseController{
 
-    @Resource
+    @Autowired
     private StockInCostService service;
 
     @RequestMapping(method = RequestMethod.POST)

src/main/java/com/originspark/drp/controllers/projects/costs/StockOutCostController.java

@@ -3,9 +3,9 @@ package com.originspark.drp.controllers.projects.costs;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +26,7 @@ import com.originspark.drp.util.json.JsonUtils;
 @RequestMapping("stockOutCost")
 public class StockOutCostController extends BaseController{
 
-    @Resource
+    @Autowired
     private StockOutCostService service;
 
     @RequestMapping(method = RequestMethod.POST)

src/main/java/com/originspark/drp/service/account/AccountServiceBean.java

@@ -17,7 +17,7 @@ import com.originspark.drp.models.User;
 import com.originspark.drp.util.enums.Status;
 
 @Transactional
-@Service("AccountService")
+@Service
 public class AccountServiceBean implements AccountService {
 
     @PersistenceContext

src/main/java/com/originspark/drp/service/projects/costs/StockInCostServiceBean.java

 package com.originspark.drp.service.projects.costs;
-/**@author yestin*/
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +18,7 @@ import com.originspark.drp.models.projects.costs.AbstractCost.COLUMNS;
 import com.originspark.drp.util.json.FilterRequest;
 
 @Transactional
-@Service("stockInCostService")
+@Service
 public class StockInCostServiceBean extends BaseDAOSupport<StockInCost> implements
         StockInCostService {
 

src/main/java/com/originspark/drp/service/projects/costs/StockOutCostServiceBean.java

 package com.originspark.drp.service.projects.costs;
-/**@author yestin*/
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +18,7 @@ import com.originspark.drp.models.projects.costs.AbstractCost.COLUMNS;
 import com.originspark.drp.util.json.FilterRequest;
 
 @Transactional
-@Service("stockOutCostService")
+@Service
 public class StockOutCostServiceBean extends BaseDAOSupport<StockOutCost> implements
         StockOutCostService {
 

src/main/java/com/originspark/drp/service/projects/invoices/StockInInvoiceServiceBean.java

@@ -24,7 +24,7 @@ import com.originspark.drp.util.enums.AuditState;
 import com.originspark.drp.util.json.FilterRequest;
 
 @Transactional
-@Service("stockInInvoiceService")
+@Service
 public class StockInInvoiceServiceBean extends BaseDAOSupport<StockInInvoice> implements
         StockInInvoiceService {
 

src/main/java/com/originspark/drp/service/projects/invoices/StockOutInvoiceServiceBean.java

@@ -24,7 +24,7 @@ import com.originspark.drp.util.enums.AuditState;
 import com.originspark.drp.util.json.FilterRequest;
 
 @Transactional
-@Service("stockOutInvoiceService")
+@Service
 public class StockOutInvoiceServiceBean extends BaseDAOSupport<StockOutInvoice> implements
         StockOutInvoiceService {
 

src/main/java/com/originspark/drp/service/resources/VendorService.java

@@ -9,7 +9,6 @@ import com.originspark.drp.dao.BaseDAO;
 import com.originspark.drp.models.resources.Vendor;
 import com.originspark.drp.util.json.FilterRequest;
 
-@Service
 public interface VendorService extends BaseDAO<Vendor>{
     
     List<Vendor> pagedDataSet(int start, int limit, List<FilterRequest> filters);

src/main/java/com/originspark/drp/service/resources/VendorServiceBean.java

@@ -17,7 +17,7 @@ import com.originspark.drp.models.resources.Vendor;
 import com.originspark.drp.models.resources.Vendor.COLUMNS;
 import com.originspark.drp.util.json.FilterRequest;
 
-@Service("vendorService")
+@Service
 public class VendorServiceBean extends BaseDAOSupport<Vendor> implements VendorService {
 
     @Override

src/main/java/com/originspark/drp/service/resources/WareCategoryService.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import com.originspark.drp.dao.BaseDAO;
 import com.originspark.drp.models.resources.WareCategory;
 
-@Service
 public interface WareCategoryService extends BaseDAO<WareCategory>{
     List<WareCategory> treeViewData();
 }

src/main/java/com/originspark/drp/service/resources/WareCategoryServiceBean.java

@@ -13,7 +13,7 @@ import com.originspark.drp.dao.BaseDAOSupport;
 import com.originspark.drp.models.resources.WareCategory;
 
 @Transactional
-@Service("wareCategoryService")
+@Service
 public class WareCategoryServiceBean extends BaseDAOSupport<WareCategory> implements
         WareCategoryService {
 

src/main/java/com/originspark/drp/service/resources/WareService.java

@@ -10,7 +10,6 @@ import com.originspark.drp.dao.BaseDAO;
 import com.originspark.drp.models.resources.Ware;
 import com.originspark.drp.util.json.FilterRequest;
 
-@Service
 public interface WareService extends BaseDAO<Ware>{
 
     List<Ware> pagedDataSet(int start, int limit, List<FilterRequest> filters);

src/main/java/com/originspark/drp/service/resources/WareServiceBean.java

@@ -23,9 +23,8 @@ import com.originspark.drp.models.resources.Ware.COLUMNS;
 import com.originspark.drp.util.json.FilterRequest;
 
 @Transactional
-@Service("wareService")
-public class WareServiceBean extends BaseDAOSupport<Ware> implements
-        WareService {
+@Service
+public class WareServiceBean extends BaseDAOSupport<Ware> implements WareService {
 
     @Override
     public List<Ware> pagedDataSet(int start, int limit,

src/main/java/com/originspark/drp/service/users/UserService.java

@@ -9,7 +9,6 @@ import com.originspark.drp.dao.BaseDAO;
 import com.originspark.drp.models.User;
 import com.originspark.drp.util.json.FilterRequest;
 
-@Service
 public interface UserService extends BaseDAO<User>{
 
     List<User> pagedDataSet(int start, int limit,List<FilterRequest> filters);

src/main/java/com/originspark/drp/service/users/UserServiceBean.java

@@ -20,7 +20,7 @@ import com.originspark.drp.util.enums.Status;
 import com.originspark.drp.util.json.FilterRequest;
 
 @Transactional
-@Service("userService")
+@Service
 public class UserServiceBean extends BaseDAOSupport<User> implements UserService {
 
     @Override