楚江ERP:订货单打印优化

@@ -21,6 +21,7 @@ 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;
+import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
@@ -79,7 +80,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     private SysDeptService sysDeptService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
-
+    @Resource
+    private TransactorHandler transactorHandler;
 
     /**
      * 查询列表
@@ -257,13 +259,13 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         return InvokeResultBuilder.success();
     }
 
-    @ApiOperation("订购单打印")
+    @ApiOperation("订货单打印")
     @GetMapping("/printPurchaseOrder")
     public void printPurchaseOrder(@NotBlank(message = "id不能为空") String id, HttpServletResponse response) throws IOException {
         PurchaseOrderInfo data = purchaseOrderInfoService.findById(id);
 
         // 设置响应头
-        setupResponse(response, data.getOrderNo() + "-订购单打印.xlsx");
+        setupResponse(response, data.getOrderNo() + "-订货单打印.xlsx");
 
         Wrapper<PurchaseOrderLine> purchaseOrderLineWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class)
                 .eq(PurchaseOrderLine::getPurchaseOrderId, id);
@@ -353,7 +355,25 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("remarks", data.getRemarks());
                     dataMap.put("createUser", data.getCreateBy());
                     dataMap.put("element", data.getElement());
-
+                    //终端=客户资信的企业类型（）
+                    String et = data.getEnterpriseType();
+                    dataMap.put("enterpriseType",
+                            "DEALER".equals(et) ? "经销商" :
+                                    "TERMINAL".equals(et) ? "终端" : "");
+                    //办事处
+                    String deptCode = transactorHandler.returnDeptCode(data.getContractCreateById());
+                    dataMap.put("officeName", returnDeptName(deptCode));
+                    //区域=创建人部门名称
+                    List<SysUserDept> sysUserDeptList = sysUserDeptService.getByUserId(data.getContractCreateById());
+                    String deptName = "";
+                    if (CollectionUtils.isNotEmpty(sysUserDeptList)) {
+                        deptName = sysUserDeptList.stream()
+                                .map(sysUserDept -> sysDeptService.findById(sysUserDept.getDeptId()))
+                                .filter(Objects::nonNull) // 防止 findById 返回 null
+                                .map(SysDept::getName)
+                                .collect(Collectors.joining(","));
+                    }
+                    dataMap.put("deptName", deptName);
 
 
                     processTemplate(workbook, dataMap);
@@ -376,6 +396,30 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         }
     }
 
+    private String returnDeptName(String deptCode) {
+        String deptName;
+        if ("BF".equals(deptCode)) {
+            deptName = "北方";
+        } else if ("CZ".equals(deptCode)) {
+            deptName = "常州";
+        } else if ("DG".equals(deptCode)) {
+            deptName = "东莞";
+        } else if ("FS".equals(deptCode)) {
+            deptName = "佛山";
+        } else if ("NB".equals(deptCode)) {
+            deptName = "宁波";
+        } else if ("SZ".equals(deptCode)) {
+            deptName = "苏州";
+        } else if ("WZ".equals(deptCode)) {
+            deptName = "温州";
+        } else if ("ZT".equals(deptCode)) {
+            deptName = "紫铜";
+        } else {
+            deptName = ""; // 包括 null 和其他无效值
+        }
+        return deptName;
+    }
+
     /**
      * 设置HTTP响应头
      */

@@ -211,6 +211,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String customerTier;
 
     /**
+     * 客户资信企业类型(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String enterpriseType;
+
+    /**
      * 规格变更状态
      */
     private String specChangeStatus;

@@ -204,8 +204,8 @@ public class LatexFormulaExcelExporterUtil {
         anchor.setRow2(rowIndex + rowRange); // 结束于下一行
 
         // 设置较小的起始偏移
-        anchor.setDx1(50);   // 水平偏移（建议值：10-100）
-        anchor.setDy1(25);   // 垂直偏移（建议值：10-50）
+        anchor.setDx1(10000);   // 水平偏移（建议值：10-100）
+        anchor.setDy1(10000);   // 垂直偏移（建议值：10-50）
 
 
         // 5. 创建图片并插入
@@ -213,7 +213,7 @@ public class LatexFormulaExcelExporterUtil {
 
         // 6. 自动调整图片大小以适应单元格 (可选)
         // 取消注释此行使图片自动适应锚点区域
-//        pict.resize(0.95); // 缩小到90%，自然产生边距
+        pict.resize(0.95); // 缩小到90%，自然产生边距
     }
 
     @Data

@@ -36,6 +36,7 @@
         <result column="workshop_name" property="workshopName"/>
         <result column="customer_credit_id" property="customerCreditId"/>
         <result column="customer_tier" property="customerTier"/>
+        <result column="enterprise_type" property="enterpriseType"/>
         <result column="type" property="type"/>
         <result column="total_quantity" property="totalQuantity"/>
         <result column="packaging_fee" property="packagingFee"/>
@@ -84,6 +85,7 @@
             ws.name AS workshop_name,
             tb.customer_credit_id,
             cc.company_suggested_category AS customer_tier,
+            cc.enterprise_type,
             tb.type,
             tb.total_quantity,
             tb.packaging_fee,