Showing
2 changed files
with
10 additions
and
2 deletions
| @@ -369,7 +369,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde | @@ -369,7 +369,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde | ||
| 369 | SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("RAW_TO_PROD_RATIO", materialProductRatio); | 369 | SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("RAW_TO_PROD_RATIO", materialProductRatio); |
| 370 | 370 | ||
| 371 | if (dataDicItem != null) { | 371 | if (dataDicItem != null) { |
| 372 | - vo.setContractType(dataDicItem.getName() + contractType); | 372 | + if ("其它".equals(dataDicItem.getName())) { |
| 373 | + vo.setContractType(processingLine.getMaterialProductRatioRemarks() + contractType); | ||
| 374 | + } else { | ||
| 375 | + vo.setContractType(dataDicItem.getName() + contractType); | ||
| 376 | + } | ||
| 373 | } | 377 | } |
| 374 | } | 378 | } |
| 375 | } | 379 | } |
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/statistics/OrderDetailReportServiceImpl.java
| @@ -352,7 +352,11 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR | @@ -352,7 +352,11 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR | ||
| 352 | String materialProductRatio = processingLine.getMaterialProductRatio(); | 352 | String materialProductRatio = processingLine.getMaterialProductRatio(); |
| 353 | SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("RAW_TO_PROD_RATIO", materialProductRatio); | 353 | SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("RAW_TO_PROD_RATIO", materialProductRatio); |
| 354 | if (dataDicItem != null) { | 354 | if (dataDicItem != null) { |
| 355 | - vo.setContractType(dataDicItem.getName() + contractType); | 355 | + if ("其它".equals(dataDicItem.getName())) { |
| 356 | + vo.setContractType(processingLine.getMaterialProductRatioRemarks() + contractType); | ||
| 357 | + } else { | ||
| 358 | + vo.setContractType(dataDicItem.getName() + contractType); | ||
| 359 | + } | ||
| 356 | } | 360 | } |
| 357 | } | 361 | } |
| 358 | } | 362 | } |