产品成材率

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004A.java

@@ -281,7 +281,7 @@ public class ServiceHGSC004A extends ServiceBase {
      */
     private void submitPlanEntity(HGSC004 hgsc004, Boolean flag, List<HGSC004A> hgsc004AList) {
         List<String> inventCodes = hgsc004AList.stream().map(HGSC004A::getProductCode).collect(Collectors.toList());
-        List<HGPZ005> hgpz005List = HGPZTools.HgPz005.listByInventCodes(inventCodes);
+        List<HGPZ005> hgpz005List =  HGPZTools.HgPz005.listByInventCodes(inventCodes);
         //第一次全部提交
         if(flag){
             //主表
@@ -295,6 +295,8 @@ public class ServiceHGSC004A extends ServiceBase {
             //加工的才生成生产计划
             mapA.put("inventSource", HGConstant.InventSource.JG);
             hgsc004AList = dao.query(HGSC004A.QUERY_BY_MATERIAL_ID,mapA, 0, -999999);
+            inventCodes = hgsc004AList.stream().map(HGSC004A::getProductCode).collect(Collectors.toList());
+            hgpz005List = HGPZTools.HgPz005.listByInventCodes(inventCodes);
             List<HGSC005A> hgsc005AList = new LinkedList<>();
             for(HGSC004A hgsc004A : hgsc004AList){
                 //全部提交后的增加、修改

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC013.java

@@ -39,8 +39,8 @@ public class ServiceHGSC013 extends ServiceEPBase {
     public EiInfo query(EiInfo inInfo) {
         try {
             Map queryMap = EiInfoUtils.getFirstRow(inInfo);
-            if (queryMap.containsKey("contractDate")){
-                queryMap.put("contractDate", DateUtils.formatShort(queryMap.get("contractDate")));
+            if (queryMap.containsKey("receiptDate")){
+                queryMap.put("receiptDate", DateUtils.formatShort(queryMap.get("receiptDate")));
             }
             List<Map> list = DaoBase.getInstance().query("HGSC013.query", queryMap);
             inInfo.set(EiConstant.resultBlock, list);