From d9f0711890442d7b789ecdab79bc4a894a238ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Thu, 10 Sep 2026 18:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaotao/modules/autoWareHourceHaian/HAIAN_AI_CONTEXT.md | 3 ++- .../modules/handlingunit/controller/PdaLabelController.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/HAIAN_AI_CONTEXT.md b/src/main/java/com/gaotao/modules/autoWareHourceHaian/HAIAN_AI_CONTEXT.md index b1a626dc..f3e2b97a 100644 --- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/HAIAN_AI_CONTEXT.md +++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/HAIAN_AI_CONTEXT.md @@ -44,7 +44,8 @@ - 标签小 site 来源于 `handling_unit.site` - rqrq - 扫标签时必须校验：`site_sub.siteid = haian_pallet.site` 且 `site_sub.subsiteid = handling_unit.site` - rqrq - 校验失败必须拒绝扫入，防止跨 subsite 串货 - rqrq -- PDA `/pda/label/split` 拆分标签时：若 `handling_unit.site` 以 `54` 开头（含 `54/54A/54B`），拆分成功后按大 `site` 查 `haian_pallet_detail`；命中则把原标签明细 `qty` 回写为剩余量，拆分新标签不入盘；未入盘则跳过，不阻断拆分 - rqrq +- PDA `/pda/label/split` 拆分标签时：若 `handling_unit.site` 以 `54` 开头（含 `54/54A/54B`），拆分成功后按大 `site` 查 `haian_pallet_detail`；命中则把原标签明细 `qty` 回写为剩余量，拆分新标签不入盘、不继承 `reserve_flag/reserve_order_ref1/2/3`；未入盘则跳过，不阻断拆分 - rqrq +- `haianPalletSorting` 手工分拣区工作盘（非被分拣源盘）明细表显示“拆分”操作列，弹窗复用 `/labelQuery` 拆分交互，保存调用老接口 `/pda/label/split`（海安特例允许复用该后台）。被分拣源盘不显示该列 - rqrq ## 6. 站点清单接口契约 diff --git a/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java b/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java index 09757036..461616d4 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java +++ b/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java @@ -227,6 +227,11 @@ public class PdaLabelController extends AbstractController { newUnit.setModifiedDate(new Date()); newUnit.setModifiedBy(operatorName); newUnit.setRemark("从标签 " + unitId + " 拆分"); + // 新标签不得继承原标签预留：预留仍留在原标签剩余量上，避免同一预留单据挂两张标签。海安手工分拣拆分也依赖此口径 - rqrq + newUnit.setReserveFlag("N"); + newUnit.setReserveOrderRef1(null); + newUnit.setReserveOrderRef2(null); + newUnit.setReserveOrderRef3(null); // 7. 保存新标签 boolean saveResult = handlingUnitService.save(newUnit);