| | |
| | | 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())); |
| | | // } |
| | | } |
| | | } |
| | | } |
| | |
| | | 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); |
| | | |
| | |
| | | // 先执行化验信息保存 |
| | | 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()) { |
| | |
| | | .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()); |
| | | } |
| | | } |
| | | |