订购单打印字典转换

@@ -14,15 +14,10 @@ import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
-import com.lframework.starter.web.inner.entity.SysDept;
-import com.lframework.starter.web.inner.entity.SysRole;
-import com.lframework.starter.web.inner.entity.SysUser;
-import com.lframework.starter.web.inner.entity.SysUserDept;
-import com.lframework.starter.web.inner.service.system.SysDeptService;
-import com.lframework.starter.web.inner.service.system.SysRoleService;
-import com.lframework.starter.web.inner.service.system.SysUserDeptService;
-import com.lframework.starter.web.inner.service.system.SysUserService;
+import com.lframework.starter.web.inner.entity.*;
+import com.lframework.starter.web.inner.service.system.*;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
@@ -255,7 +250,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         PurchaseOrderInfo data = purchaseOrderInfoService.findById(id);
 
         // 设置响应头
-        setupResponse(response, data.getOrderNo() + "-订购单打印.xls");
+        setupResponse(response, data.getOrderNo() + "-订购单打印.xlsx");
 
         Wrapper<PurchaseOrderLine> purchaseOrderLineWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class)
                 .eq(PurchaseOrderLine::getPurchaseOrderId, id);
@@ -324,13 +319,16 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     }
 
                     Map<String, Object> dataMap = new HashMap<>();
-                    dataMap.put("supplyUnit", data.getSupplyUnit());
+                    SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
+                    SysDataDicItem supplyUnitDicItem = sysDataDicItemService.findByCode("SUPPLIER", data.getSupplyUnit());
+                    dataMap.put("supplyUnit", supplyUnitDicItem == null ? "" : supplyUnitDicItem.getName());
                     dataMap.put("orderNo", data.getOrderNo());
                     dataMap.put("orderingUnitName", data.getOrderingUnitName());
                     dataMap.put("orderDate", data.getOrderDate() == null ? "" : data.getOrderDate().format(dateFormatter));
 
                     dataMap.put("totalQuantity", totalQuantity.setScale(1, RoundingMode.HALF_UP));
-                    dataMap.put("executionStandard", data.getExecutionStandard());
+                    SysDataDicItem esDicItem = sysDataDicItemService.findByCode("APPLICABLE_STANDARD", data.getExecutionStandard());
+                    dataMap.put("executionStandard", esDicItem == null ? "" : esDicItem.getName());
                     dataMap.put("deliveryMethod", data.getDeliveryMethod());
                     dataMap.put("invoicingStatus", data.getInvoicingStatus());
                     dataMap.put("pieceWeightHeader", data.getPieceWeightHeader());