1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -11607,7 +11607,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<ServiceProduct> serviceProducts = projectServiceData.getServiceProducts();
             if(serviceProducts!=null&&serviceProducts.size()>0){
                 for (ServiceProduct serviceProduct : serviceProducts) {
-                    if(serviceProduct.getProductCategoryID().equals("901")){
+                    if(serviceProduct.getProductCategoryID().equals("901")&&serviceProduct.getBaseMeasureUnitCode().equals("HUR")){
                         SapProjectService sapProjectService=new SapProjectService();
                         sapProjectService.setServiceCode(serviceProduct.getInternalID());
                         sapProjectService.setServiceName(serviceProduct.getDescription().getDescription());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -1972,7 +1972,7 @@ public class TimingTask {
                 List<ServiceProduct> serviceProducts = projectServiceData.getServiceProducts();
                 if(serviceProducts!=null&&serviceProducts.size()>0){
                     for (ServiceProduct serviceProduct : serviceProducts) {
-                        if(serviceProduct.getProductCategoryID().equals("901")){
+                        if(serviceProduct.getProductCategoryID().equals("901")&&serviceProduct.getBaseMeasureUnitCode().equals("HUR")){
                             SapProjectService sapProjectService=new SapProjectService();
                             sapProjectService.setServiceCode(serviceProduct.getInternalID());
                             sapProjectService.setServiceName(serviceProduct.getDescription().getDescription());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/ServiceProduct.java

@@ -11,6 +11,7 @@ public class ServiceProduct {
     private String internalID;
     private String productCategoryID;
     private Description description;
+    private String baseMeasureUnitCode;
 
     @XmlElement(name = "ChangeStateID")
     public String getChangeStateID() {
@@ -33,7 +34,7 @@ public class ServiceProduct {
     }
 
     @XmlElement(name = "BaseMeasureUnitCode")
-    public Description getBaseMeasureUnitCode() {
-        return description;
+    public String getBaseMeasureUnitCode() {
+        return baseMeasureUnitCode;
     }
 }