合并代码冲突;

2026-04-15 19:30:05 +08:00
parent 22aef1d84d
commit e17216eb7c
3 changed files with 225 additions and 218 deletions
@@ -424,7 +424,7 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
                receiptMaterialDetailDO.setMaterialMoreDetailList(buildMaterialMoreDetailFromReceiptFields(receiptMaterialDetailDO));
            }
            // 批次号：默认取 Sheet Ref NO's（sheetRefNo），不再自动生成 PC 流水号（逻辑见 generateAndValidateBatchNumber）
-            generateAndValidateBatchNumber(receiptMaterialDetailDO, shipperId);
+            //generateAndValidateBatchNumber(receiptMaterialDetailDO, shipperId);
            //更多属性
            materialMoreDetailList.addAll(genMaterialMoreDetail(receiptMaterialDetailDO));
            //序列号