发货单：打印添加 物料编码

@@ -9,16 +9,17 @@ import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.bo.shipments.order.GetShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.order.QueryShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanDetailBo;
-import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
-import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.xingyun.sc.entity.*;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
+import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.utils.ResponseUtil;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
-import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 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;
@@ -87,6 +88,12 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     private SysDeptService sysDeptService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private ContractDistributorLineService contractDistributorLineService;
+    @Resource
+    private ContractStdProcessingLineService contractStdProcessingLineService;
 
 
     /**
@@ -394,11 +401,12 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             BigDecimal totalActualQuantity = BigDecimal.ZERO;
             BigDecimal totalNum = BigDecimal.ZERO;
             BigDecimal totalPrice = BigDecimal.ZERO;
+            Set<String> set = new HashSet<>();
             for (ShipmentsPlanDetail detail : detailList) {
                 BigDecimal quantity = detail.getQuantity() == null ? BigDecimal.ZERO : detail.getQuantity();
                 BigDecimal actualQuantity = detail.getActualShipmentQuantity() == null ? BigDecimal.ZERO : new BigDecimal(detail.getActualShipmentQuantity());
                 BigDecimal num = detail.getNum() == null ? BigDecimal.ZERO : new BigDecimal(detail.getNum());
-
+                set.add(detail.getOrderSpecId());
                 totalQuantity = totalQuantity.add(quantity);
                 totalActualQuantity = totalActualQuantity.add(actualQuantity);
                 totalNum = totalNum.add(num);
@@ -408,6 +416,68 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                     totalPrice = totalPrice.add(result);
                 }
             }
+
+            // 用于存储最终结果的 Map: Key=orderSpecId, Value=materialCode
+            Map<String, String> resultMaterialMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(set)) {
+                List<String> orderSpecIds = new ArrayList<>(set);
+                List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByIds(orderSpecIds);
+                if (CollectionUtils.isNotEmpty(orderLineList)) {
+                    // 3. 提取关联的 contractLineId 列表
+                    List<String> contractLineIds = orderLineList.stream()
+                            .map(PurchaseOrderLine::getContractDistributorLineId)
+                            .filter(Objects::nonNull) // 防止 null 值干扰查询
+                            .distinct() // 去重，避免重复查询
+                            .collect(Collectors.toList());
+
+                    if (CollectionUtils.isNotEmpty(contractLineIds)) {
+                        // 4. 并行查询两张表 (或者串行，视数据量而定)
+                        List<ContractDistributorLine> distLines = contractDistributorLineService.listByIds(contractLineIds);
+                        List<ContractStdProcessingLine> stdLines = contractStdProcessingLineService.listByIds(contractLineIds);
+
+                        // 5. 将查询结果转为 Map 以便快速匹配 (Key = contractLineId, Value = materialCode)
+                        Map<String, String> distMaterialMap = distLines.stream()
+                                .filter(line -> line.getId() != null && line.getMaterialCode() != null)
+                                .collect(Collectors.toMap(
+                                        ContractDistributorLine::getId,
+                                        ContractDistributorLine::getMaterialCode,
+                                        (v1, v2) -> v1 // 如果有重复 ID，取第一个
+                                ));
+
+                        Map<String, String> stdMaterialMap = stdLines.stream()
+                                .filter(line -> line.getId() != null && line.getMaterialCode() != null)
+                                .collect(Collectors.toMap(
+                                        ContractStdProcessingLine::getId, // 请确认加工行实体中对应的外键方法名
+                                        ContractStdProcessingLine::getMaterialCode,
+                                        (v1, v2) -> v1
+                                ));
+
+                        // 6. 遍历最初的 orderLineList 进行组装
+                        for (PurchaseOrderLine orderLine : orderLineList) {
+                            String orderSpecId = orderLine.getId(); // 或者 getOrderSpecId()，根据你的实体定义
+                            String contractLineId = orderLine.getContractDistributorLineId();
+
+                            if (contractLineId == null) {
+                                continue;
+                            }
+
+                            String materialCode = null;
+                            // 【策略】优先取分销行材料码
+                            if (distMaterialMap.containsKey(contractLineId)) {
+                                materialCode = distMaterialMap.get(contractLineId);
+                            }
+                            // 如果分销行没有，则取加工行材料码
+                            else if (stdMaterialMap.containsKey(contractLineId)) {
+                                materialCode = stdMaterialMap.get(contractLineId);
+                            }
+                            // 只有找到材料码才放入结果集
+                            if (materialCode != null) {
+                                resultMaterialMap.put(orderSpecId, materialCode);
+                            }
+                        }
+                    }
+                }
+            }
             for (ShipmentsPlanDetail detail : detailList) {
                 ExcelUtil.setCellValue(sheet, startRow, 0, detail.getOrderNo());
                 ExcelUtil.setCellValue(sheet, startRow, 1, detail.getBrand());
@@ -438,18 +508,20 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                 if (StringUtils.isNotBlank(latex)) {
                     LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 2, 1, 7);
                 }
-                ExcelUtil.setCellValue(sheet, startRow, 9, detail.getQuantity());
+                String materialCode = resultMaterialMap.get(detail.getOrderSpecId());
+                ExcelUtil.setCellValue(sheet, startRow, 9, materialCode);
+                ExcelUtil.setCellValue(sheet, startRow, 10, detail.getQuantity());
                 if ("TYPE_2".equals(type)) {
-                    ExcelUtil.setCellValue(sheet, startRow, 10, detail.getActualShipmentQuantity());
-                    ExcelUtil.setCellValue(sheet, startRow, 11, detail.getNum());
-                    ExcelUtil.setCellValue(sheet, startRow, 12, detail.getSalesPrice());
-                    ExcelUtil.setCellValue(sheet, startRow, 13, detail.getOrderType());
-                    ExcelUtil.setCellValue(sheet, startRow, 14, detail.getYieldBatchNo());
-                    ExcelUtil.setCellValue(sheet, startRow, 15, " -- ");
-                } else {
-                    ExcelUtil.setCellValue(sheet, startRow, 13, detail.getPackagingFee());
-                    ExcelUtil.setCellValue(sheet, startRow, 15, detail.getOrderType());
+                    ExcelUtil.setCellValue(sheet, startRow, 11, detail.getActualShipmentQuantity());
+                    ExcelUtil.setCellValue(sheet, startRow, 12, detail.getNum());
+                    ExcelUtil.setCellValue(sheet, startRow, 13, detail.getSalesPrice());
+                    ExcelUtil.setCellValue(sheet, startRow, 14, detail.getOrderType());
+                    ExcelUtil.setCellValue(sheet, startRow, 15, detail.getYieldBatchNo());
                     ExcelUtil.setCellValue(sheet, startRow, 16, " -- ");
+                } else {
+                    ExcelUtil.setCellValue(sheet, startRow, 14, detail.getPackagingFee());
+                    ExcelUtil.setCellValue(sheet, startRow, 16, detail.getOrderType());
+                    ExcelUtil.setCellValue(sheet, startRow, 17, " -- ");
                 }
                 startRow++;
             }