{"role":"user","message":{"content":[{"type":"text","text":"\n根据提供的信息完善当前代码/**\n * 分层结构订单导入\n */\n @Transactional(rollbackFor = Exception.class)\n @PreAuthorize(\"@ss.hasPermi('system:order:import')\")\n @Log(title = \"订单管理\", businessType = BusinessType.IMPORT)\n @PostMapping(\"/importHierarchical\")\n public AjaxResult importHierarchicalOrder(@RequestParam(\"file\") MultipartFile file) {\n try {\n // 1. 文件验证\n if (file.isEmpty()) {\n return AjaxResult.error(\"导入文件为空\");\n }\n\n // 2. 解析分层Excel\n List importList = this.excelParser.parseHierarchicalExcel(file);\n\n if (CollectionUtils.isEmpty(importList)) {\n return AjaxResult.error(\"未找到有效的订单数据\");\n }\n\n // 3. 数据校验\n List errors = validateImportData(importList);\n if (!errors.isEmpty()) {\n return AjaxResult.error(\"数据校验失败\", errors);\n }\n\n // 4. 处理导入\n List> results = new ArrayList<>();\n int totalItems = 0;\n int successCount = 0;\n\n for (RqOrderImportDto importDTO : importList) {\n Map result = processOrder(importDTO);\n results.add(result);\n\n if ((boolean) result.get(\"success\")) {\n successCount++;\n totalItems += (int) result.get(\"itemCount\");\n }\n }\n\n // 5. 返回结果\n Map data = new HashMap<>();\n data.put(\"results\", results);\n data.put(\"totalOrders\", importList.size());\n data.put(\"successCount\", successCount);\n data.put(\"totalItems\", totalItems);\n\n String message = String.format(\"导入完成：成功 %d 个订单，共 %d 条商品明细\",\n successCount, totalItems);\n\n return AjaxResult.success(message, data);\n\n } catch (Exception e) {\n log.error(\"订单导入失败\", e);\n return AjaxResult.error(\"导入失败：\" + e.getMessage());\n }\n }\n\n /**\n * 数据校验\n */\n private List validateImportData(List importList) {\n List errors = new ArrayList<>();\n\n for (int i = 0; i < importList.size(); i++) {\n RqOrderImportDto dto = importList.get(i);\n List itemErrors = new ArrayList<>();\n\n // 检查必填字段\n if (StringUtils.isEmpty(dto.getContractNo())) {\n itemErrors.add(\"合同编号不能为空\");\n }\n if (dto.getDateOfSigning() == null) {\n itemErrors.add(\"签约日期不能为空\");\n }\n if (StringUtils.isEmpty(dto.getCustomerCode())) {\n itemErrors.add(\"客户编号不能为空\");\n }\n\n // 检查明细\n if (CollectionUtils.isEmpty(dto.getItems())) {\n itemErrors.add(\"没有商品明细数据\");\n } else {\n for (int j = 0; j < dto.getItems().size(); j++) {\n RqOrderItemImportDto item = dto.getItems().get(j);\n if (StringUtils.isEmpty(item.getProductNo()))) {\n itemErrors.add(\"第 \" + (j + 1) + \" 行：商品编号为空\");\n }\n }\n }\n\n if (!itemErrors.isEmpty()) {\n errors.add(\"订单 \" + (i + 1) + \"：\" + String.join(\"；\", itemErrors));\n }\n }\n\n return errors;\n }\n\n /**\n * 处理单个订单\n */\n private Map processOrder(RqOrderImportDto importDTO) {\n Map result = new HashMap<>();\n\n try {\n // 1. 校验合同号\n if (StringUtils.isEmpty(importDTO.getContractNo())) {\n result.put(\"success\", false);\n result.put(\"contractNo\", null);\n result.put(\"errorMsg\", \"合同编号不能为空\");\n result.put(\"itemCount\", 0);\n return result;\n }\n\n // 2. 查询或创建订单\n RqOrder order = docRqOrderRepository.findFirstByContractNo(importDTO.getContractNo());\n\n boolean isNew = (order == null);\n if (isNew) {\n order = new RqOrder();\n order.setContractNo(importDTO.getContractNo());\n }\n\n // 3. 更新订单主数据\n updateOrderHeader(order, importDTO);\n\n // 4. 处理商品明细\n List orderItems = convertToOrderItems(importDTO.getItems(), order);\n order.setItems(orderItems);\n\n // 5. 重新计算汇总\n recalculateOrderSummary(order);\n\n // 6. 设置审计字段\n setAuditFields(order, isNew);\n\n // 7. 保存订单（级联保存明细）\n docRqOrderRepository.save(order);\n\n log.info(\"订单导入成功：合同号={}, 明细数={}\",\n order.getContractNo(), orderItems.size());\n\n result.put(\"success\", true);\n result.put(\"contractNo\", order.getContractNo());\n result.put(\"itemCount\", orderItems.size());\n result.put(\"errorMsg\", null);\n\n } catch (Exception e) {\n log.error(\"处理订单失败：{}\", importDTO.getContractNo(), e);\n result.put(\"success\", false);\n result.put(\"contractNo\", importDTO.getContractNo());\n result.put(\"errorMsg\", e.getMessage());\n result.put(\"itemCount\", 0);\n }\n\n return result;\n }\n\n /**\n * 更新订单主数据\n */\n private void updateOrderHeader(RqOrder order, RqOrderImportDto importDTO) {\n // 基础信息\n order.setContractNo(importDTO.getContractNo());\n order.setDateOfSigning(importDTO.getDateOfSigning());\n order.setEstimatedTimeOfShipment(importDTO.getEstimatedTimeOfShipment());\n order.setDeliveryTime(importDTO.getDeliveryTime());\n order.setOrderNo(importDTO.getOrderNo());\n order.setSettlementCurrency(importDTO.getSettlementCurrency());\n order.setExchangeRate(importDTO.getExchangeRate());\n order.setSource(importDTO.getSource());\n order.setIsPrepayment(importDTO.getIsPrepayment());\n order.setRemark(importDTO.getOrderRemark());\n\n // 处理客户信息\n if (StringUtils.isNotEmpty(importDTO.getCustomerCode())) {\n RqCustomer customer = this.docRqCustomerRepository.findFirstByCode(importDTO.getCustomerCode());\n if (customer != null) {\n order.setCustomer(customer);\n } else {\n log.warn(\"客户编码不存在：{}\", importDTO.getCustomerCode());\n }\n }\n\n // 设置默认状态\n if (StringUtils.isEmpty(order.getReviewStatus())) {\n order.setReviewStatus(AllEnum.REVIEW_STATUS.DRAFT.getCode());\n }\n if (StringUtils.isEmpty(order.getSaleStatus())) {\n order.setSaleStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getManagerStatus())) {\n order.setManagerStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getProductStatus())) {\n order.setProductStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getQualityStatus())) {\n order.setQualityStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getPurchaseStatus())) {\n order.setPurchaseStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getOrderStatus())) {\n order.setOrderStatus(AllEnum.CONTRACT_STATUS.WAIT_DISPATCH.getCode());\n }\n\n // 时间字段\n if (order.getStartTime() == null) {\n order.setStartTime(importDTO.getDateOfSigning() != null ?\n importDTO.getDateOfSigning() : new Date());\n order.setEndTime(importDTO.getDateOfSigning() != null ?\n importDTO.getDateOfSigning() : new Date());\n }\n }\n\n /**\n * 转换商品明细\n */\n private List convertToOrderItems(List itemDTOs,\n RqOrder order) {\n List items = new ArrayList<>();\n\n if (CollectionUtils.isEmpty(itemDTOs)) {\n return items;\n }\n\n for (RqOrderItemImportDto dto : itemDTOs) {\n RqOrderItem item = new RqOrderItem();\n item.setId(IdUtils.simpleUUID());\n\n // 基础字段\n item.setProductDescription(dto.getProductDescription());\n item.setMaterialBarcode(dto.getMaterialBarcode());\n item.setCustomerSkuCode(dto.getCustomerSkuCode());\n //item.setLineNo(dto.getLineNo());\n item.setDrawingNo(dto.getDrawingNo());\n item.setQty(dto.getQty());\n item.setMaterial(dto.getMaterial());\n item.setSize(dto.getSize());\n item.setHeatNo(dto.getHeatNo());\n //item.setCoating(dto.getCoating());\n item.setThickness(dto.getThickness());\n item.setCoatingHardness(dto.getCoatingHardness());\n\n // 处理商品信息\n if (StringUtils.isNotEmpty(dto.getProductName())) {\n // 根据品名查询商品\n RqProduct product = this.docRqProductRepository.findFirstByProductName(dto.getProductName());\n if (product != null) {\n item.setProduct(product);\n } else {\n log.warn(\"商品品名不存在：{}\", dto.getProductName());\n }\n }\n\n // 处理规格信息（将内/外/高合并到尺寸字段）\n StringBuilder sizeBuilder = new StringBuilder();\n if (StringUtils.isNotEmpty(dto.getSpecInner())) {\n sizeBuilder.append(\"内:\").append(dto.getSpecInner());\n }\n if (StringUtils.isNotEmpty(dto.getSpecOuter())) {\n if (sizeBuilder.length() > 0) sizeBuilder.append(\" \");\n sizeBuilder.append(\"外:\").append(dto.getSpecOuter());\n }\n if (StringUtils.isNotEmpty(dto.getSpecHeight())) {\n if (sizeBuilder.length() > 0) sizeBuilder.append(\" \");\n sizeBuilder.append(\"高:\").append(dto.getSpecHeight());\n }\n if (sizeBuilder.length() > 0 && StringUtils.isEmpty(item.getSize())) {\n item.setSize(sizeBuilder.toString());\n }\n\n // 设置默认值\n item.setGoodsAmount(AllEnum.NUMBER.ZERO.getCode());\n item.setOtherStandardsID(new ArrayList<>());\n item.setBasicSizes(new HashMap<>());\n item.setCustomerInspectionSpecificationItp(\"0\");\n item.setCertificateType(\"0\");\n\n items.add(item);\n }\n\n return items;\n }\n\n /**\n * 重新计算订单汇总\n */\n private void recalculateOrderSummary(RqOrder order) {\n List items = order.getItems();\n if (CollectionUtils.isEmpty(items)) {\n order.setTotalShippedQty(\"0\");\n order.setTotalQty(\"0\");\n order.setGoodsAmount(\"0\");\n order.setOtherAddAmount(\"0\");\n order.setOtherSubAmount(\"0\");\n order.setTotalAmount(\"0\");\n return;\n }\n\n // 汇总数量\n int totalQty = items.stream()\n .filter(item -> StringUtils.isNotEmpty(item.getQty()))\n .mapToInt(item -> {\n try {\n return Integer.parseInt(item.getQty());\n } catch (NumberFormatException e) {\n return 0;\n }\n })\n .sum();\n\n // 汇总金额（如果有单价和数量）\n BigDecimal goodsAmount = items.stream()\n .filter(item -> StringUtils.isNotEmpty(item.getQty()) &&\n StringUtils.isNotEmpty(item.getUnitPrice()))\n .map(item -> {\n try {\n BigDecimal qty = new BigDecimal(item.getQty());\n BigDecimal price = new BigDecimal(item.getUnitPrice());\n return qty.multiply(price);\n } catch (NumberFormatException e) {\n return BigDecimal.ZERO;\n }\n })\n .reduce(BigDecimal.ZERO, BigDecimal::add);\n\n order.setTotalQty(String.valueOf(totalQty));\n order.setGoodsAmount(goodsAmount.toString());\n\n BigDecimal addAmount = new BigDecimal(order.getOtherAddAmount());\n BigDecimal subAmount = new BigDecimal(order.getOtherAddAmount());\n\n // 总金额 = 商品金额 + 其他增加 - 其他减少\n BigDecimal totalAmount = goodsAmount\n .add(order.getOtherAddAmount() != null ? addAmount : BigDecimal.ZERO)\n .subtract(order.getOtherSubAmount() != null ? subAmount : BigDecimal.ZERO);\n order.setTotalAmount(totalAmount.toString());\n }\n\n /**\n * 设置审计字段\n */\n private void setAuditFields(RqOrder order, boolean isNew) {\n String username = SecurityUtils.getUsername();\n Date now = new Date();\n\n if (isNew) {\n order.setCreateBy(username);\n order.setCreateTime(now);\n }\n order.setUpdateBy(username);\n order.setUpdateTime(now);\n }/**\n * 分层结构Excel解析器\n */\n@Slf4j\n@Component\npublic class HierarchicalExcelParser {\n /**\n * 解析分层结构的Excel文件\n */\n public List parseHierarchicalExcel(MultipartFile file) throws Exception {\n List result = new ArrayList<>();\n\n Workbook workbook = WorkbookFactory.create(file.getInputStream());\n Sheet sheet = workbook.getSheetAt(0);\n\n // 1. 解析订单主数据（第1行）\n Row orderRow = sheet.getRow(0);\n RqOrderImportDto orderDTO = parseOrderHeader(orderRow);\n\n // 2. 解析商品明细（从第3行开始）\n List items = new ArrayList<>();\n int startRow = 3; // 明细数据从第3行开始\n\n for (int i = startRow; i <= sheet.getLastRowNum(); i++) {\n Row row = sheet.getRow(i);\n if (row == null) continue;\n\n // 检查是否为空行（第一列为空则跳过）\n Cell firstCell = row.getCell(0);\n if (firstCell == null || StringUtils.isEmpty(getCellValue(firstCell))) {\n continue;\n }\n\n RqOrderItemImportDto item = parseOrderItem(row);\n items.add(item);\n }\n\n orderDTO.setItems(items);\n result.add(orderDTO);\n\n workbook.close();\n return result;\n }\n\n /**\n * 解析订单主数据\n */\n private RqOrderImportDto parseOrderHeader(Row row) {\n RqOrderImportDto dto = new RqOrderImportDto();\n\n dto.setContractNo(getCellValue(row.getCell(0)));\n dto.setDateOfSigning(getCellDate(row.getCell(1)));\n dto.setCustomerCode(getCellValue(row.getCell(2)));\n //dto.setCustomerOrderNo(getCellValue(row.getCell(3)));\n //dto.setRqOrderNo(getCellValue(row.getCell(4)));\n dto.setOrderRemark(getCellValue(row.getCell(5)));\n\n return dto;\n }\n\n /**\n * 解析商品明细\n */\n private RqOrderItemImportDto parseOrderItem(Row row) {\n RqOrderItemImportDto dto = new RqOrderItemImportDto();\n\n dto.setProductName(getCellValue(row.getCell(0)));\n dto.setMaterialBarcode(getCellValue(row.getCell(1)));\n dto.setCustomerSkuCode(getCellValue(row.getCell(2)));\n //dto.setLineNo(getCellValue(row.getCell(3)));\n dto.setProductDescription(getCellValue(row.getCell(4)));\n dto.setDrawingNo(getCellValue(row.getCell(5)));\n dto.setQty(getCellValue(row.getCell(6)));\n dto.setMaterial(getCellValue(row.getCell(7)));\n dto.setSize(getCellValue(row.getCell(8)));\n dto.setSpecInner(getCellValue(row.getCell(9)));\n dto.setSpecOuter(getCellValue(row.getCell(10)));\n dto.setSpecHeight(getCellValue(row.getCell(11)));\n dto.setHeatNo(getCellValue(row.getCell(12)));\n dto.setCoating(getCellValue(row.getCell(13)));\n dto.setThickness(getCellValue(row.getCell(14)));\n dto.setCoatingHardness(getCellValue(row.getCell(15)));\n\n return dto;\n }\n\n /**\n * 获取单元格值\n */\n private String getCellValue(Cell cell) {\n if (cell == null) return null;\n\n switch (cell.getCellType()) {\n case STRING:\n return cell.getStringCellValue();\n case NUMERIC:\n if (DateUtil.isCellDateFormatted(cell)) {\n return cell.getDateCellValue().toString();\n }\n return String.valueOf(cell.getNumericCellValue());\n case BOOLEAN:\n return String.valueOf(cell.getBooleanCellValue());\n case FORMULA:\n return cell.getCellFormula();\n default:\n return null;\n }\n }\n\n /**\n * 获取单元格日期\n */\n private Date getCellDate(Cell cell) {\n if (cell == null) return null;\n if (cell.getCellType() == CellType.NUMERIC && DateUtil.isCellDateFormatted(cell)) {\n return cell.getDateCellValue();\n }\n try {\n String value = getCellValue(cell);\n if (StringUtils.isNotEmpty(value)) {\n SimpleDateFormat sdf = new SimpleDateFormat(\"yyyy-MM-dd\");\n return sdf.parse(value);\n }\n } catch (Exception e) {\n log.warn(\"日期解析失败: {}\", cell);\n }\n return null;\n }\n}public class RqOrderImportDto {\n\n // ========== 订单主数据 ==========\n @Excel(name = \"合同编号\")\n private String contractNo;\n\n @JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")\n @Excel(name = \"签约日期\", dateFormat = \"yyyy-MM-dd HH:mm:ss\")\n private Date dateOfSigning;\n\n @JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")\n @Excel(name = \"预计船期\", dateFormat = \"yyyy-MM-dd HH:mm:ss\")\n private Date estimatedTimeOfShipment;\n\n @JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")\n @Excel(name = \"交货期\", dateFormat = \"yyyy-MM-dd HH:mm:ss\")\n private Date deliveryTime;\n\n @Excel(name = \"客户编号\")\n private String customerCode;\n\n @Excel(name = \"客户订单号\")\n private String orderNo;\n\n @Excel(name = \"结算币种\")\n private String settlementCurrency;\n\n @Excel(name = \"汇率\")\n private String exchangeRate;\n\n @Excel(name = \"来源\")\n private String source;\n\n @Excel(name = \"是否预收款\")\n private String isPrepayment;\n\n @Excel(name = \"订单备注\")\n private String orderRemark;\n\n // ========== 商品明细列表 ==========\n private List items;\n}public class RqOrderItemImportDto {\n\n @Excel(name = \"商品编号\")\n private String productNo;\n\n @Excel(name = \"客户货号\")\n private String customerSkuCode;\n\n @Excel(name = \"订单行号\")\n private String lineNumber;\n\n @Excel(name = \"商品描述\")\n private String productDescription;\n\n @Excel(name = \"交货日期\")\n @JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")\n private Date deliveryTime;\n\n @Excel(name = \"材质\")\n private String material;\n\n @Excel(name = \"图纸编号\")\n private String drawingNo;\n\n @Excel(name = \"图纸版本号\")\n private String drawingRevision;\n\n @Excel(name = \"尺寸\")\n private String size;\n\n @Excel(name = \"销售单位\")\n private String saleUnit;\n\n @Excel(name = \"数量\")\n private String qty;\n\n @Excel(name = \"价格\")\n private String unitPrice;\n\n @Excel(name = \"规格(内)\")\n private String specInner;\n\n @Excel(name = \"规格(外)\")\n private String specOuter;\n\n @Excel(name = \"规格(高)\")\n private String specHeight;\n\n @Excel(name = \"炉号\")\n private String heatNo;\n\n @Excel(name = \"涂层\")\n private String coating;\n\n @Excel(name = \"厚度\")\n private String thickness;\n\n @Excel(name = \"涂层硬度\")\n private String coatingHardness;\n\n @Excel(name = \"是否外协\")\n private String isOut;\n\n @Excel(name = \"打标信息\")\n private String markingInfo;\n}/**\n * 新增Rq订单\n */\n @PreAuthorize(\"@ss.hasPermi('system:order:add')\")\n @Log(title = \"Rq订单\", businessType = BusinessType.INSERT)\n @PostMapping\n public R add(@RequestBody RqOrder rqOrder)\n {\n //查询客户信息\n RqCustomer customer = this.rqCustomerService.selectRqCustomerById(rqOrder.getCustomer().getId());\n if(customer == null){\n throw new ServiceException(\"未查询到当前客户\");\n }\n RqCustomer rqCustomer = new RqCustomer();\n rqCustomer.setId(customer.getId());\n rqCustomer.setCode(customer.getCode());\n rqCustomer.setSysUserId(customer.getSysUserId());\n rqCustomer.setName(customer.getName());\n rqCustomer.setNameShort(customer.getNameShort());\n rqCustomer.setNameEn(customer.getNameEn());\n rqOrder.setCustomer(rqCustomer);\n rqOrder.setSaleUserId(customer.getSysUserId().toString());\n // 新增时，设置为不允许修改\n rqOrder.setAllowModify(AllEnum.RQ_ORDER_ALLOW.NOT_ALLOWED.getCode()); // 初始不允许修改\n // 合同快照版本号\n rqOrder.setCurrentSnapshotVersion(0);\n // 修改次数\n rqOrder.setModifyCount(0);\n //生成合同编号\n if(rqOrder.getContractNo() == null || rqOrder.getContractNo().equals(\"\")){\n String code = UniqueIdGenerator.generateIdOrder();\n rqOrder.setContractNo(code);\n }\n //生成订单号：26.02.13 此字段为 瑞球的客户的订单号，为手工录入\n// String code = UniqueIdGenerator.generateIdOrderNo(customer.getNameShort());\n// rqOrder.setOrderNo(code);\n //计算商品数和商品总额\n BigDecimal goodsTotal = BigDecimal.ZERO;\n BigDecimal total = BigDecimal.ZERO;\n //获取图纸id\n List ids = new ArrayList<>();\n //计算商品行销售总额\n for(RqOrderItem item : rqOrder.getItems()){\n //查询商品编号和名字\n RqProduct product = this.rqProductService.selectRqProductById(item.getProduct().getId());\n if(product != null){\n product.setUnit(item.getProduct().getUnit());\n item.setProduct(product);\n }\n //生成商品行物料条码\n String materialCode = UniqueIdGenerator.generateIdMaterial();\n item.setMaterialBarcode(materialCode);\n // 销售总额 = 订单数 * 单价\n BigDecimal quantity = Optional.ofNullable(item.getQty()).filter(qty -> !qty.trim().isEmpty()).map(BigDecimal::new).orElse(BigDecimal.ZERO);\n // 转换单价\n BigDecimal unitPrice = Optional.ofNullable(item.getUnitPrice()).filter(price -> !price.trim().isEmpty()).map(BigDecimal::new).orElse(BigDecimal.ZERO);\n BigDecimal saleTotal = quantity.multiply(unitPrice);\n // 销售总额\n item.setGoodsAmount(saleTotal.toString());\n // 累加商品总数量\n goodsTotal = goodsTotal.add(quantity);\n // 累加商品总额\n total = total.add(saleTotal);\n // 判断是否新增图纸\n RqDrawingIndex indexs = this.rqDrawingIndexRepository.findFirstByDrawingNoAndDrawingRevision(item.getDrawingNo(),item.getDrawingRevision());\n //根据商品的毛坯id查询材质的模版\n RqBlank rqBlank = item.getBlank();\n // 如果indexs为null，创建新的RqDrawingIndex\n if (indexs == null) {\n RqDrawingIndex index = new RqDrawingIndex();\n index.setDrawingImgUrl(item.getDrawingImgUrl());\n index.setDrawingNo(item.getDrawingNo());\n index.setDrawingRevision(item.getDrawingRevision());\n // 只有在rqBlank不为null时才设置blankMaterialType\n if (rqBlank != null) {\n index.setBlankMaterialType(rqBlank.getBlankMaterialType());\n }\n this.rqDrawingIndexService.insertRqDrawingIndex(index);\n ids.add(index.getId());\n }\n }\n rqOrder.setTotalQty(goodsTotal.toString());\n rqOrder.setGoodsAmount(total.toString());\n BigDecimal otherAdd = BigDecimal.ZERO;\n BigDecimal otherSub = BigDecimal.ZERO;\n //计算其他增加款项和其他扣除款项\n for (RqOrderPaymentItem paymentItem : rqOrder.getPaymentItems()) {\n if (paymentItem.getType().equals(\"Add\")) {\n otherAdd = otherAdd.add(new BigDecimal(paymentItem.getAmount()));\n } else {\n otherSub = otherSub.add(new BigDecimal(paymentItem.getAmount()));\n }\n }\n rqOrder.setOtherAddAmount(otherAdd.toString());\n rqOrder.setOtherSubAmount(otherSub.toString());\n rqOrder.setTotalAmount(total.add(otherAdd).subtract(otherSub).toString());\n //将所有审核状态设为待审核\n rqOrder.setReviewStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n rqOrder.setSaleStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n rqOrder.setProductStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n rqOrder.setQualityStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n rqOrder.setPurchaseStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n rqOrder.setManagerStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n rqOrder.setCreateBy(getUsername());\n rqOrder.setCreateTime(new Date());\n rqOrder.setUpdateBy(getUsername());\n rqOrder.setUpdateTime(new Date());\n\n rqOrderService.insertRqOrder(rqOrder);\n //批量更新图纸合同id\n for(String i : ids){\n RqDrawingIndex index = this.rqDrawingIndexService.selectRqDrawingIndexById(i);\n index.setRefId(rqOrder.getId());\n this.rqDrawingIndexService.updateRqDrawingIndex(index);\n }\n return R.ok(rqOrder.getId());\n }\n"}]}}
{"role":"assistant","message":{"content":[{"type":"text","text":"我先在代码库里查找相关实现和 DTO/Excel 结构，再对照你贴的片段给出完善建议。\n\n[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"pattern":"importHierarchical|HierarchicalExcelParser|RqOrderImportDto","glob":"**/*.{java,xml}"}},{"type":"tool_use","name":"Glob","input":{"glob_pattern":"**/*Order*Controller*.java"}},{"type":"tool_use","name":"Glob","input":{"glob_pattern":"**/*RqOrder*.java"}}]}}
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Shell","input":{"command":"Get-ChildItem -Path \"C:\\Users\\Administrator\" -Filter \"*HierarchicalExcelParser*\" -Recurse -ErrorAction SilentlyContinue -Depth 6 | Select-Object -First 5 FullName","description":"Find HierarchicalExcelParser file on system"}}]}}
{"role":"assistant","message":{"content":[{"type":"text","text":"你这套「分层 Excel 导入」的整体流程是对的，但和现有 `add` 方法、DTO 定义之间有几处不一致和明显 bug。下面按模块说明问题，并给出可直接对照修改的完善版代码。\n\n---\n\n## 一、当前主要问题\n\n| 位置 | 问题 |\n|------|------|\n| `validateImportData` | 语法错误：`item.getProductNo()))` 多了一个 `)` |\n| `HierarchicalExcelParser` | 明细第 0 列解析为 `productName`，DTO/校验用的是 `productNo` |\n| `convertToOrderItems` | 按品名查商品，未设置 `unitPrice`、`goodsAmount`、未生成 `materialBarcode` |\n| `recalculateOrderSummary` | `subAmount` 误用了 `getOtherAddAmount()`，应为 `getOtherSubAmount()` |\n| `updateOrderHeader` | 缺少 `add` 中的 `allowModify`、`currentSnapshotVersion`、`modifyCount`、`saleUserId` 等 |\n| 与 `add` 不一致 | 未创建 `RqDrawingIndex`、未按商品编号查商品、行金额未计算 |\n\n---\n\n## 二、Excel 列映射建议（分层模板）\n\n假设：**第 1 行（index 0）= 订单头，第 3 行起（index 2 起）= 明细**。\n\n### 订单头（第 1 行）\n\n| 列 | 字段 |\n|----|------|\n| 0 | 合同编号 |\n| 1 | 签约日期 |\n| 2 | 客户编号 |\n| 3 | 客户订单号 |\n| 4 | 预计船期 |\n| 5 | 交货期 |\n| 6 | 结算币种 |\n| 7 | 汇率 |\n| 8 | 来源 |\n| 9 | 是否预收款 |\n| 10 | 订单备注 |\n\n### 明细（从第 3 行）\n\n| 列 | 字段 |\n|----|------|\n| 0 | 商品编号 |\n| 1 | 客户货号 |\n| 2 | 订单行号 |\n| 3 | 商品描述 |\n| 4 | 交货日期 |\n| 5 | 材质 |\n| 6 | 图纸编号 |\n| 7 | 图纸版本号 |\n| 8 | 尺寸 |\n| 9 | 销售单位 |\n| 10 | 数量 |\n| 11 | 价格 |\n| 12 | 规格(内) |\n| 13 | 规格(外) |\n| 14 | 规格(高) |\n| 15 | 炉号 |\n| 16 | 涂层 |\n| 17 | 厚度 |\n| 18 | 涂层硬度 |\n\n若你实际模板列不同，只需改 `parseOrderHeader` / `parseOrderItem` 的列号。\n\n---\n\n## 三、完善后的 `HierarchicalExcelParser`\n\n```java\n@Slf4j\n@Component\npublic class HierarchicalExcelParser {\n\n public List parseHierarchicalExcel(MultipartFile file) throws Exception {\n List result = new ArrayList<>();\n\n try (Workbook workbook = WorkbookFactory.create(file.getInputStream())) {\n Sheet sheet = workbook.getSheetAt(0);\n\n Row orderRow = sheet.getRow(0);\n if (orderRow == null) {\n return result;\n }\n\n RqOrderImportDto orderDTO = parseOrderHeader(orderRow);\n\n List items = new ArrayList<>();\n int startRow = 2; // 第3行开始（0-based）\n\n for (int i = startRow; i <= sheet.getLastRowNum(); i++) {\n Row row = sheet.getRow(i);\n if (row == null || isEmptyRow(row)) {\n continue;\n }\n items.add(parseOrderItem(row));\n }\n\n orderDTO.setItems(items);\n result.add(orderDTO);\n }\n return result;\n }\n\n private boolean isEmptyRow(Row row) {\n Cell firstCell = row.getCell(0);\n return firstCell == null || StringUtils.isEmpty(getCellValue(firstCell));\n }\n\n private RqOrderImportDto parseOrderHeader(Row row) {\n RqOrderImportDto dto = new RqOrderImportDto();\n dto.setContractNo(getCellValue(row.getCell(0)));\n dto.setDateOfSigning(getCellDate(row.getCell(1)));\n dto.setCustomerCode(getCellValue(row.getCell(2)));\n dto.setOrderNo(getCellValue(row.getCell(3)));\n dto.setEstimatedTimeOfShipment(getCellDate(row.getCell(4)));\n dto.setDeliveryTime(getCellDate(row.getCell(5)));\n dto.setSettlementCurrency(getCellValue(row.getCell(6)));\n dto.setExchangeRate(getCellValue(row.getCell(7)));\n dto.setSource(getCellValue(row.getCell(8)));\n dto.setIsPrepayment(getCellValue(row.getCell(9)));\n dto.setOrderRemark(getCellValue(row.getCell(10)));\n return dto;\n }\n\n private RqOrderItemImportDto parseOrderItem(Row row) {\n RqOrderItemImportDto dto = new RqOrderItemImportDto();\n dto.setProductNo(getCellValue(row.getCell(0)));\n dto.setCustomerSkuCode(getCellValue(row.getCell(1)));\n dto.setLineNumber(getCellValue(row.getCell(2)));\n dto.setProductDescription(getCellValue(row.getCell(3)));\n dto.setDeliveryTime(getCellDate(row.getCell(4)));\n dto.setMaterial(getCellValue(row.getCell(5)));\n dto.setDrawingNo(getCellValue(row.getCell(6)));\n dto.setDrawingRevision(getCellValue(row.getCell(7)));\n dto.setSize(getCellValue(row.getCell(8)));\n dto.setSaleUnit(getCellValue(row.getCell(9)));\n dto.setQty(getCellValue(row.getCell(10)));\n dto.setUnitPrice(getCellValue(row.getCell(11)));\n dto.setSpecInner(getCellValue(row.getCell(12)));\n dto.setSpecOuter(getCellValue(row.getCell(13)));\n dto.setSpecHeight(getCellValue(row.getCell(14)));\n dto.setHeatNo(getCellValue(row.getCell(15)));\n dto.setCoating(getCellValue(row.getCell(16)));\n dto.setThickness(getCellValue(row.getCell(17)));\n dto.setCoatingHardness(getCellValue(row.getCell(18)));\n return dto;\n }\n\n private String getCellValue(Cell cell) {\n if (cell == null) return null;\n switch (cell.getCellType()) {\n case STRING:\n return StringUtils.trim(cell.getStringCellValue());\n case NUMERIC:\n if (DateUtil.isCellDateFormatted(cell)) {\n return new SimpleDateFormat(\"yyyy-MM-dd\").format(cell.getDateCellValue());\n }\n double num = cell.getNumericCellValue();\n if (num == Math.floor(num)) {\n return String.valueOf((long) num);\n }\n return String.valueOf(num);\n case BOOLEAN:\n return String.valueOf(cell.getBooleanCellValue());\n case FORMULA:\n try {\n return StringUtils.trim(cell.getStringCellValue());\n } catch (Exception e) {\n return String.valueOf(cell.getNumericCellValue());\n }\n default:\n return null;\n }\n }\n\n private Date getCellDate(Cell cell) {\n if (cell == null) return null;\n if (cell.getCellType() == CellType.NUMERIC && DateUtil.isCellDateFormatted(cell)) {\n return cell.getDateCellValue();\n }\n try {\n String value = getCellValue(cell);\n if (StringUtils.isNotEmpty(value)) {\n return new SimpleDateFormat(\"yyyy-MM-dd\").parse(value);\n }\n } catch (Exception e) {\n log.warn(\"日期解析失败: {}\", cell);\n }\n return null;\n }\n}\n```\n\n---\n\n## 四、完善后的校验逻辑\n\n```java\nprivate List validateImportData(List importList) {\n List errors = new ArrayList<>();\n\n for (int i = 0; i < importList.size(); i++) {\n RqOrderImportDto dto = importList.get(i);\n List itemErrors = new ArrayList<>();\n\n if (StringUtils.isEmpty(dto.getContractNo())) {\n itemErrors.add(\"合同编号不能为空\");\n }\n if (dto.getDateOfSigning() == null) {\n itemErrors.add(\"签约日期不能为空\");\n }\n if (StringUtils.isEmpty(dto.getCustomerCode())) {\n itemErrors.add(\"客户编号不能为空\");\n }\n\n if (CollectionUtils.isEmpty(dto.getItems())) {\n itemErrors.add(\"没有商品明细数据\");\n } else {\n for (int j = 0; j < dto.getItems().size(); j++) {\n RqOrderItemImportDto item = dto.getItems().get(j);\n if (StringUtils.isEmpty(item.getProductNo())) {\n itemErrors.add(\"第 \" + (j + 1) + \" 行：商品编号为空\");\n }\n if (StringUtils.isEmpty(item.getQty())) {\n itemErrors.add(\"第 \" + (j + 1) + \" 行：数量为空\");\n }\n }\n }\n\n if (!itemErrors.isEmpty()) {\n errors.add(\"订单 \" + (i + 1) + \"：\" + String.join(\"；\", itemErrors));\n }\n }\n return errors;\n}\n```\n\n---\n\n## 五、对齐 `add` 方法的 `updateOrderHeader`\n\n```java\nprivate void updateOrderHeader(RqOrder order, RqOrderImportDto importDTO) {\n order.setContractNo(importDTO.getContractNo());\n order.setDateOfSigning(importDTO.getDateOfSigning());\n order.setEstimatedTimeOfShipment(importDTO.getEstimatedTimeOfShipment());\n order.setDeliveryTime(importDTO.getDeliveryTime());\n order.setOrderNo(importDTO.getOrderNo());\n order.setSettlementCurrency(importDTO.getSettlementCurrency());\n order.setExchangeRate(importDTO.getExchangeRate());\n order.setSource(importDTO.getSource());\n order.setIsPrepayment(importDTO.getIsPrepayment());\n order.setRemark(importDTO.getOrderRemark());\n\n if (StringUtils.isNotEmpty(importDTO.getCustomerCode())) {\n RqCustomer customer = docRqCustomerRepository.findFirstByCode(importDTO.getCustomerCode());\n if (customer != null) {\n RqCustomer rqCustomer = new RqCustomer();\n rqCustomer.setId(customer.getId());\n rqCustomer.setCode(customer.getCode());\n rqCustomer.setSysUserId(customer.getSysUserId());\n rqCustomer.setName(customer.getName());\n rqCustomer.setNameShort(customer.getNameShort());\n rqCustomer.setNameEn(customer.getNameEn());\n order.setCustomer(rqCustomer);\n order.setSaleUserId(customer.getSysUserId().toString());\n } else {\n throw new ServiceException(\"客户编码不存在：\" + importDTO.getCustomerCode());\n }\n }\n\n // 新增订单时初始化（与 add 一致）\n if (order.getId() == null) {\n order.setAllowModify(AllEnum.RQ_ORDER_ALLOW.NOT_ALLOWED.getCode());\n order.setCurrentSnapshotVersion(0);\n order.setModifyCount(0);\n order.setOtherAddAmount(\"0\");\n order.setOtherSubAmount(\"0\");\n }\n\n if (StringUtils.isEmpty(order.getReviewStatus())) {\n order.setReviewStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getSaleStatus())) {\n order.setSaleStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getManagerStatus())) {\n order.setManagerStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getProductStatus())) {\n order.setProductStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getQualityStatus())) {\n order.setQualityStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getPurchaseStatus())) {\n order.setPurchaseStatus(AllEnum.REVIEW_STATUS.WAIT.getCode());\n }\n if (StringUtils.isEmpty(order.getOrderStatus())) {\n order.setOrderStatus(AllEnum.CONTRACT_STATUS.WAIT_DISPATCH.getCode());\n }\n\n if (order.getStartTime() == null) {\n Date baseDate = importDTO.getDateOfSigning() != null ? importDTO.getDateOfSigning() : new Date();\n order.setStartTime(baseDate);\n order.setEndTime(baseDate);\n }\n}\n```\n\n---\n\n## 六、完善后的 `convertToOrderItems`（对齐 `add`）\n\n```java\nprivate List convertToOrderItems(List itemDTOs, RqOrder order) {\n List items = new ArrayList<>();\n if (CollectionUtils.isEmpty(itemDTOs)) {\n return items;\n }\n\n for (RqOrderItemImportDto dto : itemDTOs) {\n RqOrderItem item = new RqOrderItem();\n item.setId(IdUtils.simpleUUID());\n item.setOrder(order);\n\n // 基础字段\n item.setProductDescription(dto.getProductDescription());\n item.setCustomerSkuCode(dto.getCustomerSkuCode());\n item.setDrawingNo(dto.getDrawingNo());\n item.setDrawingRevision(dto.getDrawingRevision());\n item.setQty(dto.getQty());\n item.setUnitPrice(dto.getUnitPrice());\n item.setMaterial(dto.getMaterial());\n item.setSize(dto.getSize());\n item.setHeatNo(dto.getHeatNo());\n item.setThickness(dto.getThickness());\n item.setCoatingHardness(dto.getCoatingHardness());\n\n // 物料条码：导入无则自动生成（与 add 一致）\n item.setMaterialBarcode(UniqueIdGenerator.generateIdMaterial());\n\n // 按商品编号查商品（不是品名）\n if (StringUtils.isNotEmpty(dto.getProductNo())) {\n RqProduct product = docRqProductRepository.findFirstByProductNo(dto.getProductNo());\n if (product == null) {\n throw new ServiceException(\"商品编号不存在：\" + dto.getProductNo());\n }\n item.setProduct(product);\n }\n\n // 规格合并到尺寸\n if (StringUtils.isEmpty(item.getSize())) {\n StringBuilder sizeBuilder = new StringBuilder();\n if (StringUtils.isNotEmpty(dto.getSpecInner())) {\n sizeBuilder.append(\"内:\").append(dto.getSpecInner());\n }\n if (StringUtils.isNotEmpty(dto.getSpecOuter())) {\n if (sizeBuilder.length() > 0) sizeBuilder.append(\" \");\n sizeBuilder.append(\"外:\").append(dto.getSpecOuter());\n }\n if (StringUtils.isNotEmpty(dto.getSpecHeight())) {\n if (sizeBuilder.length() > 0) sizeBuilder.append(\" \");\n sizeBuilder.append(\"高:\").append(dto.getSpecHeight());\n }\n if (sizeBuilder.length() > 0) {\n item.setSize(sizeBuilder.toString());\n }\n }\n\n // 行金额 = 数量 × 单价（与 add 一致）\n BigDecimal quantity = Optional.ofNullable(dto.getQty())\n .filter(q -> !q.trim().isEmpty())\n .map(BigDecimal::new)\n .orElse(BigDecimal.ZERO);\n BigDecimal unitPrice = Optional.ofNullable(dto.getUnitPrice())\n .filter(p -> !p.trim().isEmpty())\n .map(BigDecimal::new)\n .orElse(BigDecimal.ZERO);\n item.setGoodsAmount(quantity.multiply(unitPrice).toString());\n\n // 图纸索引（与 add 类似）\n if (StringUtils.isNotEmpty(dto.getDrawingNo())) {\n RqDrawingIndex index = rqDrawingIndexRepository\n .findFirstByDrawingNoAndDrawingRevision(dto.getDrawingNo(), dto.getDrawingRevision());\n if (index == null) {\n index = new RqDrawingIndex();\n index.setDrawingNo(dto.getDrawingNo());\n index.setDrawingRevision(dto.getDrawingRevision());\n rqDrawingIndexService.insertRqDrawingIndex(index);\n }\n if (order.getId() != null) {\n index.setRefId(order.getId());\n rqDrawingIndexService.updateRqDrawingIndex(index);\n }\n }\n\n item.setOtherStandardsID(new ArrayList<>());\n item.setBasicSizes(new HashMap<>());\n item.setCustomerInspectionSpecificationItp(\"0\");\n item.setCertificateType(\"0\");\n\n items.add(item);\n }\n return items;\n}\n```\n\n说明：`findFirstByProductNo` 需与你们 Repository 实际方法名一致（可能是 `findByCode`、`findFirstByCode` 等）。\n\n---\n\n## 七、修复 `recalculateOrderSummary`\n\n```java\nprivate void recalculateOrderSummary(RqOrder order) {\n List items = order.getItems();\n if (CollectionUtils.isEmpty(items)) {\n order.setTotalShippedQty(\"0\");\n order.setTotalQty(\"0\");\n order.setGoodsAmount(\"0\");\n order.setOtherAddAmount(StringUtils.defaultIfEmpty(order.getOtherAddAmount(), \"0\"));\n order.setOtherSubAmount(StringUtils.defaultIfEmpty(order.getOtherSubAmount(), \"0\"));\n order.setTotalAmount(\"0\");\n return;\n }\n\n BigDecimal totalQty = items.stream()\n .map(item -> Optional.ofNullable(item.getQty())\n .filter(q -> !q.trim().isEmpty())\n .map(BigDecimal::new)\n .orElse(BigDecimal.ZERO))\n .reduce(BigDecimal.ZERO, BigDecimal::add);\n\n BigDecimal goodsAmount = items.stream()\n .map(item -> Optional.ofNullable(item.getGoodsAmount())\n .filter(a -> !a.trim().isEmpty())\n .map(BigDecimal::new)\n .orElse(BigDecimal.ZERO))\n .reduce(BigDecimal.ZERO, BigDecimal::add);\n\n BigDecimal otherAdd = Optional.ofNullable(order.getOtherAddAmount())\n .filter(a -> !a.trim().isEmpty())\n .map(BigDecimal::new)\n .orElse(BigDecimal.ZERO);\n BigDecimal otherSub = Optional.ofNullable(order.getOtherSubAmount())\n .filter(a -> !a.trim().isEmpty())\n .map(BigDecimal::new)\n .orElse(BigDecimal.ZERO);\n\n order.setTotalQty(totalQty.toPlainString());\n order.setGoodsAmount(goodsAmount.toPlainString());\n order.setTotalAmount(goodsAmount.add(otherAdd).subtract(otherSub).toPlainString());\n}\n```\n\n---\n\n## 八、其他建议\n\n1. **更新已有订单时的明细策略** \n 当前是 `order.setItems(orderItems)` 全量替换。若 JPA 未配置 orphanRemoval，可能产生脏数据。建议：先 `order.getItems().clear()` 再 `addAll`，或按 `lineNumber` 做 upsert。\n\n2. **事务与部分成功** \n 类上有 `@Transactional`，单条失败被 `processOrder` 捕获后，其它成功项仍会一起提交。若希望「一条失败全部回滚」，去掉 `processOrder` 里的 try-catch，或改为逐条 `@Transactional(propagation = REQUIRES_NEW)`。\n\n3. **客户不存在** \n 建议在 `validateImportData` 阶段校验客户、商品是否存在，避免导入中途才失败。\n\n4. **`RqOrderItemImportDto` 缺 `productName`** \n 若 Excel 实际是品名而非编号，应在 DTO 增加 `productName`，解析和校验二选一或都支持。\n\n---\n\n当前是 **Ask 模式**，我无法直接改你仓库里的文件。若需要我在项目里直接改代码并跑编译，请切换到 **Agent 模式**。 \n你也可以补充：实际 Excel 模板截图或列定义，我可以按你的真实列顺序再出一版精确映射。\n\n[REDACTED]"}]}}
{"type":"turn_ended","status":"success"}