调整计划管理模块

jiazx0107@163.com

2023-05-17 a87eff704037284e46568c7c7b8a60caaae884c2

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java

@@ -139,12 +139,12 @@
                     continue;
                  }

                  if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
                     result.setWet(Double.valueOf(checkItem.getValue()));
                  }
                  if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
                     result.setImpurity(Double.valueOf(checkItem.getValue()));
                  }
//                  if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
//                     result.setWet(Double.valueOf(checkItem.getValue()));
//                  }
//                  if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
//                     result.setImpurity(Double.valueOf(checkItem.getValue()));
//                  }
               }
            }
         }
@@ -392,14 +392,14 @@
         progressData.setNoticeId(data.getNoticeId());
      }

      // 回填水分和杂质
      if (checkResult.getWet() > 0) {
         progressData.setWet(checkResult.getWet());
      }

      if (checkResult.getImpurity() > 0) {
         progressData.setImpurity(checkResult.getImpurity());
      }
//      // 回填水分和杂质
//      if (checkResult.getWet() > 0) {
//         progressData.setWet(checkResult.getWet());
//      }
//
//      if (checkResult.getImpurity() > 0) {
//         progressData.setImpurity(checkResult.getImpurity());
//      }

      String msg = inoutService.updateData(progressData);

@@ -817,8 +817,8 @@
         // 先执行化验信息保存
         CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(),data.getCheckItems());
         if (null != checkResult) {
            if (null == data.getWet())data.setWet(checkResult.getWet());
            if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
//            if (null == data.getWet())data.setWet(checkResult.getWet());
//            if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
         }
      } else {
         if (null == data.getEmptyWeightTime()) {
@@ -888,10 +888,10 @@
               .updateCheckItems(data.getCheckId(), data.getCompanyId(),
                     data.getCheckItems());
         if (null != checkResult) {
            if (null == data.getWet())
               data.setWet(checkResult.getWet());
            if (null == data.getImpurity())
               data.setImpurity(checkResult.getImpurity());
//            if (null == data.getWet())
//               data.setWet(checkResult.getWet());
//            if (null == data.getImpurity())
//               data.setImpurity(checkResult.getImpurity());
         }
      }