Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj

src/main/java/com/aps/service/Algorithm/MaterialRequirementService.java

 package com.aps.service.Algorithm;
 
 
+import com.aps.common.util.FileHelper;
 import com.aps.common.util.GlobalCacheUtil;
 import com.aps.common.util.redis.RedisUtils;
 import com.aps.entity.*;
@@ -1249,7 +1250,7 @@ if(demand==null)
                        }
                    }
                }
-
+               FileHelper.writeLogFile("BOM:"+material.getCode());
                if (needed <= 0) {
                    orderMaterial.setYpQty(allneeded - needed);
                    orderMaterial.setQjQty(needed);
@@ -1281,7 +1282,7 @@ if(demand==null)
                        for (RoutingSupportingReplace rsr : routingsupportingreplaces2) {
 
                            Material material1 = materials.get(rsr.getTargetmaterialid());
-
+                           FileHelper.writeLogFile("RoutingSupportingReplace:"+material1.getCode());
                            if (material1 == null) {
                                break;
                            }
@@ -1291,6 +1292,7 @@ if(demand==null)
 
 
                                needed -= useStock;
+                               FileHelper.writeLogFile("RoutingSupportingReplace: "+material1.getCode()+": "+useStock);
                                orderMaterial.setUseStock(orderMaterial.getUseStock() + useStock);
                                orderMaterial.getReplaceMaterial().add(orderMaterial1);
                                if (needed <= 0) {

src/test/java/com/aps/demo/PlanResultServiceTest.java

@@ -42,7 +42,7 @@ public class PlanResultServiceTest {
        // nsgaiiUtils.Test();
 
      //     planResultService.execute2("64E64F6B68094AF38CEDC418630C3CC2");//2000
-             planResultService.execute2("5C93A528725F40228889FCFC1E040B55");//2000
+             planResultService.execute2("72744D094BAB45948F5172E84C78B260");//2000
 
         //  planResultService.execute2("15210B13B88A453F8B84AAC7F16C7541");//2000