| | |
|---|
| | | detailService.removeById(tjOrderDetail.getOrderDetailId()); |
|---|
| | | } else { |
|---|
| | | tjOrderDetail.setProject(byId); |
|---|
| | | String metering = byId.getProMetering(); |
|---|
| | | if (StrUtil.isNotBlank(metering)) |
|---|
| | | tjOrderDetail.setUnit(metering); |
|---|
| | | } |
|---|
| | | List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId())); |
|---|
| | | if (list2.size() == 0) { |
|---|
| | |
|---|
| | | for (TjOrderDetail tjOrderDetail : tjOrderDetails) { |
|---|
| | | if(remark.getProId().equals(tjOrderDetail.getProId())){ |
|---|
| | | String ckfw = tjOrderDetail.getStanId(); |
|---|
| | | if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())){ |
|---|
| | | ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(),""); |
|---|
| | | } |
|---|
| | | if (StrUtil.isNotBlank(ckfw)) { |
|---|
| | | try { |
|---|
| | | Integer.parseInt(tjOrderDetail.getYcbz()); |
|---|
| | |
|---|
| | | }else { |
|---|
| | | tjOrderDetail.setYcbz(""); |
|---|
| | | } |
|---|
| | | } catch (NumberFormatException ignored) { } |
|---|
| | | } catch (NumberFormatException ignored) { |
|---|
| | | ignored.printStackTrace(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){ |
|---|
| | | tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]"); |
|---|
