Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -12,6 +12,11 @@ public class ChangeData {
     private List<ChangeItem> otherChangeList;
 
     /**
+     * 变更时间
+     */
+    private String changeTime;
+
+    /**
      * 核心人员变更前
      */
     private List<CorePersonnelHistory> personnelBeforeChangeList;
@@ -44,4 +49,12 @@ public class ChangeData {
     public void setPersonnelAfterChangeList(List<CorePersonnelHistory> personnelAfterChangeList) {
         this.personnelAfterChangeList = personnelAfterChangeList;
     }
+
+    public String getChangeTime() {
+        return changeTime;
+    }
+
+    public void setChangeTime(String changeTime) {
+        this.changeTime = changeTime;
+    }
 }

@@ -740,7 +740,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
                                     || "INTL_INVENTORY_AGMT".equals(data.getType())
                                     || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
                                 setCellValue(sheet, startRow, 9, contractDistributorLineBo.getProcessingFee()); // I列
-                                setCellValue(sheet, startRow, 10, contractDistributorLineBo.getProcessingFee().add(contractDistributorLineBo.getUnitPrice())); // K列
+                                setCellValue(sheet, startRow, 10, contractDistributorLineBo.getUnitPrice()); // K列
                             } else {
                                 setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列
                                 setCellValue(sheet, startRow, 10, contractDistributorLineBo.getAmountExcludingTax()); // K列

@@ -193,6 +193,11 @@ public class CustomerCreditHistoryController extends DefaultBaseController {
 
         result.setOtherChangeList(differencesWithIndex);
 
+        LocalDateTime createTime = data.getCreateTime();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String newDate = createTime.format(formatter);
+        result.setChangeTime(newDate);
+
         return InvokeResultBuilder.success(result);
     }
 

-package com.lframework.xingyun.sc.controller.purchase;
+package com.lframework.xingyun.sc.controller.shipments;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -19,7 +19,6 @@ import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
-import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderLineBo;
 import com.lframework.xingyun.sc.bo.purchase.QueryReplenishmentOrderBo;
@@ -55,7 +54,7 @@ import java.util.stream.Collectors;
 @Api(tags = "补货单")
 @Validated
 @RestController
-@RequestMapping("/purchase/replenishmentOrder")
+@RequestMapping("/shipments/replenishmentOrder")
 public class ReplenishmentOrderController extends DefaultBaseController {
 
     @Resource
@@ -80,7 +79,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"purchase:replenishmentorder:query"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryReplenishmentOrderBo>> query(@Valid QueryReplenishmentOrderVo vo) {
         if (vo != null && StringUtils.isNotBlank(vo.getCustomerName())) {
@@ -160,7 +159,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"purchase:replenishmentorder:query"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:query"})
     @GetMapping
     public InvokeResult<GetReplenishmentOrderBo> get(@NotBlank(message = "id不能为空！") String id) {
 
@@ -203,7 +202,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"purchase:replenishmentorder:add"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateReplenishmentOrderVo vo) {
 
@@ -216,7 +215,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"purchase:replenishmentorder:modify"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:modify"})
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateReplenishmentOrderVo vo) {
 
@@ -231,7 +230,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 取消
      */
     @ApiOperation("取消")
-    @HasPermission({"purchase:replenishmentorder:cancel"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:cancel"})
     @GetMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
 
@@ -246,7 +245,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 填写补货时间
      */
     @ApiOperation("填写补货时间")
-    @HasPermission({"purchase:replenishmentorder:fillRestockTime"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:fill"})
     @PostMapping("/fillRestockTime")
     public InvokeResult<Void> fillRestockTime(@RequestBody UpdateReplenishmentOrderVo vo) {
 

 package com.lframework.xingyun.sc.controller.shipments.car;
 
+import cn.hutool.core.io.resource.ClassPathResource;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import com.lframework.xingyun.sc.bo.shipments.car.GetCarRequestPlanBo;
 import com.lframework.xingyun.sc.entity.CarRequestPlan;
@@ -21,13 +23,28 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import javax.validation.Valid;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -35,6 +52,7 @@ import java.util.stream.Collectors;
  *
  */
 @Api(tags = "要车计划表")
+@Slf4j
 @Validated
 @RestController
 @RequestMapping("/carRequestPlan")
@@ -94,7 +112,7 @@ public class CarRequestPlanController extends DefaultBaseController {
     @ApiOperation("新增")
     @HasPermission({"carRequestPlan:carrequestplan:add"})
     @PostMapping
-    public InvokeResult<Void> create(@Valid CreateCarRequestPlanVo vo) {
+    public InvokeResult<Void> create(@Valid @RequestBody CreateCarRequestPlanVo vo) {
 
         carRequestPlanService.create(vo);
 
@@ -107,7 +125,7 @@ public class CarRequestPlanController extends DefaultBaseController {
     @ApiOperation("修改")
     @HasPermission({"carRequestPlan:carrequestplan:modify"})
     @PutMapping
-    public InvokeResult<Void> update(@Valid UpdateCarRequestPlanVo vo) {
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateCarRequestPlanVo vo) {
 
         carRequestPlanService.update(vo);
 
@@ -127,4 +145,201 @@ public class CarRequestPlanController extends DefaultBaseController {
 
         return InvokeResultBuilder.success();
     }
+
+    @ApiOperation("要车计划打印")
+    @GetMapping("/printCarRequestPlan")
+    public void printCarRequestPlan(@NotBlank(message = "id不能为空") String id, HttpServletResponse response) throws IOException {
+        CarRequestPlan data = carRequestPlanService.findById(id);
+        // 设置响应头
+        setupResponse(response, data.getWorkshopName() + "-" + data.getRequestCarData() + "-要车计划打印.xlsx");
+
+        QueryRequestCarTicketVo vo = new QueryRequestCarTicketVo();
+        vo.setPlanId(id);
+        List<RequestCarTicket> requestCarTicketList = requestCarTicketService.query(vo);
+
+
+        try {
+            // 加载模板文件
+            ClassPathResource templateResource = new ClassPathResource("templates/carRequestPlanTemplate.xlsx");
+            try (InputStream inputStream = templateResource.getStream();
+                 Workbook workbook = new XSSFWorkbook(inputStream)) {
+                try {
+                    Sheet sheet = workbook.getSheetAt(0);
+                    DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                    int startRow = 3; // 要车单开始行
+                    BigDecimal totalQuantity=BigDecimal.ZERO;
+                    CellStyle borderedStyle = workbook.createCellStyle();
+                    borderedStyle.setBorderTop(BorderStyle.THIN);
+                    borderedStyle.setBorderBottom(BorderStyle.THIN);
+                    borderedStyle.setBorderLeft(BorderStyle.THIN);
+                    borderedStyle.setBorderRight(BorderStyle.THIN);
+                    if (CollectionUtils.isNotEmpty(requestCarTicketList)) {
+                        for (int i = 0; i < requestCarTicketList.size(); i++) {
+                            RequestCarTicket requestCarTicket = requestCarTicketList.get(i);
+                            setCellValue(sheet, startRow, 0, i + 1, borderedStyle);
+                            setCellValue(sheet, startRow, 1, requestCarTicket.getDeptName(), borderedStyle);
+                            setCellValue(sheet, startRow, 2, requestCarTicket.getDeliveryDate() == null ? "" : requestCarTicket.getDeliveryDate().format(dateFormatter), borderedStyle);
+                            setCellValue(sheet, startRow, 3, requestCarTicket.getWorkshopName(), borderedStyle);
+                            setCellValue(sheet, startRow, 4, requestCarTicket.getOrderNo(), borderedStyle);
+                            setCellValue(sheet, startRow, 5, requestCarTicket.getCustomerShortName(), borderedStyle);
+                            setCellValue(sheet, startRow, 6, requestCarTicket.getDestination(), borderedStyle);
+                            setCellValue(sheet, startRow, 7, requestCarTicket.getQuantity(), borderedStyle);
+                            totalQuantity = totalQuantity.add(requestCarTicket.getQuantity());
+                            setCellValue(sheet, startRow, 8, requestCarTicket.getConsignee(), borderedStyle);
+                            setCellValue(sheet, startRow, 9, requestCarTicket.getPhone(), borderedStyle);
+                            setCellValue(sheet, startRow, 10, requestCarTicket.getReturnPlanArrangement(), borderedStyle);
+                            setCellValue(sheet, startRow, 11, requestCarTicket.getOther(), borderedStyle);
+                            setCellValue(sheet, startRow, 12, requestCarTicket.getExternalAuditorName(), borderedStyle);
+                            setCellValue(sheet, startRow, 13, requestCarTicket.getLoadingTime(), borderedStyle);
+                            setCellValue(sheet, startRow, 14, requestCarTicket.getSpecialLoadingRequirement(), borderedStyle);
+                            setCellValue(sheet, startRow, 15, requestCarTicket.getBusinessOfficeAuditorName(), borderedStyle);
+                            setCellValue(sheet, startRow, 16, requestCarTicket.getOperationsDepartmentAuditorName(), borderedStyle);
+                            startRow++;
+                        }
+                        // === 写合计行（带完整边框，包括合并区域）===
+                        Row totalRow = sheet.getRow(startRow);
+                        if (totalRow == null) totalRow = sheet.createRow(startRow);
+
+                        // 1. 先为合并区域 [0, 6] 的每个单元格设置边框样式（即使内容为空）
+                        for (int col = 0; col <= 6; col++) {
+                            Cell cell = totalRow.getCell(col);
+                            if (cell == null) {
+                                cell = totalRow.createCell(col);
+                            }
+                            cell.setCellStyle(borderedStyle);
+                            if (col == 0) {
+                                cell.setCellValue("合计：");
+                            } else {
+                                cell.setCellValue(""); // 空内容
+                            }
+                        }
+
+                        // 2. 设置数量列（第7列）
+                        Cell totalCell = totalRow.getCell(7);
+                        if (totalCell == null) {
+                            totalCell = totalRow.createCell(7);
+                        }
+                        totalCell.setCellValue(totalQuantity.setScale(4, RoundingMode.HALF_UP).doubleValue());
+                        totalCell.setCellStyle(borderedStyle);
+
+                        // 3. 其他列（8~16）也建议补空 + 边框，保持表格整齐（可选但推荐）
+                        for (int col = 8; col <= 16; col++) {
+                            Cell cell = totalRow.getCell(col);
+                            if (cell == null) {
+                                cell = totalRow.createCell(col);
+                            }
+                            cell.setCellStyle(borderedStyle);
+                            cell.setCellValue("");
+                        }
+
+                        // 4. 最后再执行合并（必须在所有单元格创建之后）
+                        sheet.addMergedRegion(new CellRangeAddress(startRow, startRow, 0, 6));
+                    }
+
+                    Map<String, Object> dataMap = new HashMap<>();
+                    dataMap.put("requestCarData", data.getRequestCarData() == null ? "" : data.getRequestCarData().format(dateFormatter));
+
+                    processTemplate(workbook, dataMap);
+
+                    // 写入响应流
+                    workbook.write(response.getOutputStream());
+                    response.getOutputStream().flush();
+                } finally {
+                    IOUtils.closeQuietly(workbook);
+                }
+
+            } catch (FileNotFoundException e) {
+                throw new RuntimeException("模板文件不存在: templates/carRequestPlanTemplate.xlsx", e);
+            } catch (IOException e) {
+                throw new RuntimeException("无法读取模板文件: templates/carRequestPlanTemplate.xlsx", e);
+            }
+        } catch (Exception e) {
+            log.error("要车计划打印: {}", e.getMessage(), e);
+            throw e;
+        }
+    }
+
+    /**
+     * 设置HTTP响应头
+     */
+    private void setupResponse(HttpServletResponse response, String fileName) throws IOException {
+        String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("Content-Disposition", "attachment;filename=" + encodedFileName);
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+    }
+
+    /**
+     * 设置单元格值
+     */
+    private static void setCellValue(Sheet sheet, int rowNum, int colNum, Object value, CellStyle style) {
+        Row row = sheet.getRow(rowNum);
+        if (row == null) {
+            row = sheet.createRow(rowNum);
+        }
+        Cell cell = row.getCell(colNum);
+        if (cell == null) {
+            cell = row.createCell(colNum);
+        }
+        cell.setCellStyle(style); // 应用边框样式
+
+        if (value == null) {
+            cell.setCellValue("");
+        } else if (value instanceof String) {
+            cell.setCellValue((String) value);
+        } else if (value instanceof Integer) {
+            cell.setCellValue((Integer) value);
+        } else if (value instanceof Double || value instanceof BigDecimal) {
+            cell.setCellValue(((Number) value).doubleValue());
+        } else if (value instanceof LocalDate) {
+            cell.setCellValue(((LocalDate) value).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        } else {
+            cell.setCellValue(value.toString());
+        }
+    }
+
+    private void processTemplate(Workbook workbook, Map<String, Object> dataMap) {
+        Sheet sheet = workbook.getSheetAt(0);
+
+        for (Row row : sheet) {
+            for (Cell cell : row) {
+                if (cell.getCellTypeEnum() == CellType.STRING) {
+                    String cellValue = cell.getStringCellValue();
+                    String newValue = replacePlaceholders(cellValue, dataMap);
+                    if (!cellValue.equals(newValue)) {
+                        cell.setCellValue(newValue);
+                    }
+                }
+            }
+        }
+    }
+
+    private String replacePlaceholders(String text, Map<String, Object> dataMap) {
+        if (text == null || text.isEmpty()) {
+            return text;
+        }
+
+        String result = text;
+        for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
+            String placeholder = "${" + entry.getKey() + "}";
+            String value = entry.getValue() != null ? entry.getValue().toString() : "";
+            // 将数据库中的 \n 转换为 Excel 识别的换行符
+            value = value.replace("\\n", "\n");
+
+            result = result.replace(placeholder, value);
+        }
+
+        for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
+            String placeholder = "#{" + entry.getKey() + "}";
+            String value = entry.getValue() != null ? entry.getValue().toString() : "";
+            // 将数据库中的 \n 转换为 Excel 识别的换行符
+            value = value.replace("\\n", "\n");
+
+            result = result.replace(placeholder, value);
+        }
+
+        return result;
+    }
 }

@@ -526,6 +526,15 @@ public class ContractDistributorStandardServiceImpl extends
         createPurchaseOrderInfoVo.setContractCreateById(contractDistributorStandard.getCreateById());
         createPurchaseOrderInfoVo.setDeptId(contractDistributorStandard.getDeptId());
         createPurchaseOrderInfoVo.setWorkshopId(contractDistributorStandard.getWorkshopId());
+        createPurchaseOrderInfoVo.setExecutionStandard(contractDistributorStandard.getExecutionStandard());
+        createPurchaseOrderInfoVo.setExecutionStandardRemarks(contractDistributorStandard.getExecutionStandardRemarks());
+        createPurchaseOrderInfoVo.setPieceWeightHeader(contractDistributorStandard.getPieceWeightHead());
+        createPurchaseOrderInfoVo.setSurface(contractDistributorStandard.getSurface());
+        createPurchaseOrderInfoVo.setTolerance(contractDistributorStandard.getTolerance());
+        createPurchaseOrderInfoVo.setPerformance(contractDistributorStandard.getPerformance());
+        createPurchaseOrderInfoVo.setElement(contractDistributorStandard.getComponent());
+        createPurchaseOrderInfoVo.setPackaging(contractDistributorStandard.getPackaging());
+        createPurchaseOrderInfoVo.setRemarks(contractDistributorStandard.getRemarks());
         createPurchaseOrderInfoVo.setType("NO_PRODUCTION");
         createPurchaseOrderInfoVo.setExamineStatus("AUDIT");
 

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 
@@ -67,8 +68,8 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
         vo1.setWorkshopId(vo.getWorkshopId());
         LocalDate date = vo.getRequestCarData();
         if (date != null) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-            String dateString = formatter.format(date);
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            String dateString = date.format(formatter); // LocalDate 自带 format 方法
             vo1.setRequestCarDataStart(dateString);
             vo1.setRequestCarDataEnd(dateString);
         }

@@ -108,7 +108,7 @@
                 AND tb.status = #{vo.status}
             </if>
             <if test="vo.planId != null and vo.planId != ''">
-                AND tb.plan_id = #{planId}
+                AND tb.plan_id = #{vo.planId}
             </if>
         </where>
         ORDER BY tb.update_time DESC