朱园亮 / xingyun-erp · Commits

Commit 28f0cd3aaa5fb2a7c5c30d1088a72036f97afb0d

Authored by 房远帅
1 parent 05778da5

订货单打印：执行标准是其它取执行标准备注的值

Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
@@ -450,7 +450,10 @@ public class PurchaseOrderInfoController extends DefaultBaseController { @@ -450,7 +450,10 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
450 450
451 dataMap.put("totalQuantity", totalQuantity.setScale(1, RoundingMode.HALF_UP)); 451 dataMap.put("totalQuantity", totalQuantity.setScale(1, RoundingMode.HALF_UP));
452 SysDataDicItem esDicItem = sysDataDicItemService.findByCode("APPLICABLE_STANDARD", data.getExecutionStandard()); 452 SysDataDicItem esDicItem = sysDataDicItemService.findByCode("APPLICABLE_STANDARD", data.getExecutionStandard());
453 - dataMap.put("executionStandard", esDicItem == null ? "" : esDicItem.getName()); 453 + dataMap.put("executionStandard",
  454 + esDicItem == null ? "" :
  455 + "其它".equals(esDicItem.getName()) ? data.getExecutionStandardRemarks() : esDicItem.getName()
  456 + );
454 dataMap.put("deliveryMethod", data.getDeliveryMethod()); 457 dataMap.put("deliveryMethod", data.getDeliveryMethod());
455 dataMap.put("invoicingStatus", data.getInvoicingStatus()); 458 dataMap.put("invoicingStatus", data.getInvoicingStatus());
456 dataMap.put("pieceWeightHeader", data.getPieceWeightHeader()); 459 dataMap.put("pieceWeightHeader", data.getPieceWeightHeader());