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 6cc24a14..a81b64e7 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 @@ -68,7 +68,7 @@ - 海安 `haian_pallet.calling_flag` 改成 `N` 时必须同步 `remark=NULL`,清掉占用文案(如运输栈板/叫料单号)。老公共 `updatePalletCallingFlag` 传 null 不会更新 remark,海安释放路径按关闭申请单注释口径补齐;自动发料失败仍走独立 `updatePalletRemark` 覆盖失败原因 - rqrq - 海安 `haian_pallet.wcs_location` 只表示货架占用:仅 `入货架` 写入货位、`出货架` 清空。AGV `放货完成`、`到达出库口`、`离开入库口`、到达手工分拣区都只改 `location_code`(及需要时的 `area`),禁止把入库口/出库口/输送线写进 `wcs_location` - rqrq - 海安 `入货架` 定时消费落位后,若托盘 `calling_flag=Y` 且 `remark` 包含“运输入库”或“组盘入库”(组盘运输入库、空托运输入库、组盘入库),把 `calling_flag` 改成 N 并清空 `remark`。补发回调没有任务号时也要放。运输栈板、直接组盘、分拣结束等其它占用不动 - rqrq -- 海安 PC「库位差异托盘」页:`wms-vue/src/views/modules/haianWarehouse/warehouse/palletLocationMismatch54.vue`,菜单 `sql/20261110_haian_pc_pallet_location_mismatch_menu.sql`(menu_id=690180)。上表只统计有明细、有区域、区域已配仓库库位,且标签主数据缺失或仓库/库位与 `haian_area` 不一致的托盘;无区域不参与。查询 `POST /autoWareHourceHaian/haiAnPalletLocationMismatch/search` 使用 `NOLOCK`,只展示。点行和左侧「托盘重移库」分别复用 PDA `scanPalletForRelocate`、`retryPalletRelocate`,不另写移库 - rqrq +- 海安 PC「库位差异托盘」页:`wms-vue/src/views/modules/haianWarehouse/warehouse/palletLocationMismatch54.vue`,菜单 `sql/20261110_haian_pc_pallet_location_mismatch_menu.sql`(menu_id=690180)。上表只统计有明细、有区域、区域已配仓库库位,且标签主数据缺失或仓库/库位与 `haian_area` 不一致的托盘;无区域不参与。查询 `POST /autoWareHourceHaian/haiAnPalletLocationMismatch/search` 使用 `NOLOCK`,只展示。点行和左侧「托盘重移库」分别复用 PDA `scanPalletForRelocate`、`retryPalletRelocate`,不另写移库。差异标签带出 `handling_unit` 的 `wdr`、`eng_chg_level`(版本号)、`receive_date`、`expired_date`(失效日期)、`availability_control_id`(可用性控制ID),只展示,不参与是否移库判断 - rqrq - 海安 `wcsWareHouse`「离开入库口」消费时:释放 `calling_flag`,`area` 写死 `HaiAnAreaStaticData.STOCK_AREA`(A01),`location_code` 写死 `HaiAnStationStaticData.BUFFER_CONVEYOR`(立库输送线,与出货架同一落点;老模块 `Virtual_AS` 只识别不写入),禁止改 `wcs_location` - rqrq - 海安 `wcsWareHouse`「到达出库口」按 WCS `toBarcode` 原样改托盘 `location_code`(可同步 `area`),禁止再转成固定出库口名,也禁止改 `wcs_location` - rqrq - 海安 `wcsWareHouse`「到达异常位」必须带具体点位,命中 `HaiAnStationStaticData.ERROR_STATIONS` 后按该点位落托盘位置;禁止写死 `1101`。`handleRobotError` 取消调用,整盘无-1/-2才清盘,不主动写异常位点位,等到达异常位回传 - rqrq diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/pda/HaiAnPalletRelocateMismatchRow.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/pda/HaiAnPalletRelocateMismatchRow.java index 1728b758..47227a6d 100644 --- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/pda/HaiAnPalletRelocateMismatchRow.java +++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/pda/HaiAnPalletRelocateMismatchRow.java @@ -1,8 +1,10 @@ package com.gaotao.modules.autoWareHourceHaian.entity.pda; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * @author rqrq @@ -46,6 +48,33 @@ public class HaiAnPalletRelocateMismatchRow { */ private String locationId; + /** + * WDR,来源handling_unit.wdr。标签主数据缺失时为空。只给PC差异明细展示,不参与移库判断。不落库。 - rqrq + */ + private String wdr; + + /** + * 版本号,来源handling_unit.eng_chg_level。与标签查询页版本号同一字段。只展示,不参与移库判断。不落库。 - rqrq + */ + private String engChgLevel; + + /** + * 接收日期,来源handling_unit.receive_date。按自然日返回,标签缺失时为空。只展示,不参与移库判断。不落库。 - rqrq + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date receiveDate; + + /** + * 失效日期,来源handling_unit.expired_date。按自然日返回,标签缺失时为空。只展示,不参与移库判断。不落库。 - rqrq + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date expiredDate; + + /** + * 可用性控制ID,来源handling_unit.availability_control_id。现场说的控制号就是这一列。只展示,不参与移库判断。不落库。 - rqrq + */ + private String availabilityControlId; + /** * 是否在库,来源handling_unit.in_stock_flag,Y才可能进入移库单据。不落库。 - rqrq */ diff --git a/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml b/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml index 1965381a..a5480e63 100644 --- a/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml +++ b/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml @@ -125,6 +125,11 @@ h.qty AS qty, h.warehouse_id AS warehouseId, h.location_id AS locationId, + h.wdr AS wdr, + h.eng_chg_level AS engChgLevel, + h.receive_date AS receiveDate, + h.expired_date AS expiredDate, + h.availability_control_id AS availabilityControlId, h.in_stock_flag AS inStockFlag, CASE WHEN h.unit_id IS NULL THEN 'Y' ELSE 'N' END AS labelMissing FROM haian_pallet_detail d