diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/CostCenterController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/CostCenterController.java index 3b59711..520f3d4 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/CostCenterController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/CostCenterController.java @@ -29,8 +29,8 @@ public class CostCenterController { * @return */ @RequestMapping(value = "/getCostCenter", method = RequestMethod.GET) - public BaseResponse getCostCenter() { - List costCenters = costCenterService.getCostCenter(); + public BaseResponse getCostCenter(String erpFactory) { + List costCenters = costCenterService.getCostCenter(erpFactory); return RespGenerator.returnOK(costCenters); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/CostCenterDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/CostCenterDao.java index b9355bb..1d64a16 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/dao/CostCenterDao.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/CostCenterDao.java @@ -15,7 +15,7 @@ import java.util.Map; @Mapper public interface CostCenterDao { - List getCostCenter(); + List getCostCenter(@Param("erpFactory") String erpFactory); List> getUserInfo(); void updatePacking(@Param("SALESHIPREQUESTNAME") String SALESHIPREQUESTNAME, diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/CostCenterService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/CostCenterService.java index 7bff627..4e50184 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/CostCenterService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/CostCenterService.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; public interface CostCenterService { - List getCostCenter(); + List getCostCenter(String erpFactory); List> getUserInfo(); void updateCareerAssistanceNew(JSONObject in); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/CostCenterServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/CostCenterServiceImpl.java index 22f3d0b..f7b9776 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/CostCenterServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/CostCenterServiceImpl.java @@ -34,8 +34,8 @@ public class CostCenterServiceImpl implements CostCenterService { private ToSAPServiceImpl toSAPService; @Override - public List getCostCenter() { - return costCenterDao.getCostCenter(); + public List getCostCenter(String erpFactory) { + return costCenterDao.getCostCenter(erpFactory); } @Override diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/CostCenterDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/CostCenterDao.xml index d925529..bc4632a 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/CostCenterDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/CostCenterDao.xml @@ -5,6 +5,8 @@