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

房远帅
1 parent 05778da5
Showing 1 changed file with 4 additions and 1 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
View file @28f0cd3
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
View file @28f0cd3
@@ -450,7 +450,10 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
 
                     dataMap.put("totalQuantity", totalQuantity.setScale(1, RoundingMode.HALF_UP));
                     SysDataDicItem esDicItem = sysDataDicItemService.findByCode("APPLICABLE_STANDARD", data.getExecutionStandard());
-                    dataMap.put("executionStandard", esDicItem == null ? "" : esDicItem.getName());
+                    dataMap.put("executionStandard",
+                            esDicItem == null ? "" :
+                                    "其它".equals(esDicItem.getName()) ? data.getExecutionStandardRemarks() : esDicItem.getName()
+                    );
                     dataMap.put("deliveryMethod", data.getDeliveryMethod());
                     dataMap.put("invoicingStatus", data.getInvoicingStatus());
                     dataMap.put("pieceWeightHeader", data.getPieceWeightHeader());