fix: stabilize overseas initialization and PDA acceptance

2026-09-10 10:25:16 +08:00
parent 37a28b9c11
commit e72e74b21e
12 changed files with 160 additions and 375 deletions
@@ -52,7 +52,7 @@ public interface PdaWarehouseMapper extends BaseMapper<PdaOperationHistory> {
        "FROM ll_pda_operation_history h WHERE h.overseas_warehouse_id=#{warehouseId} AND h.operator_key=#{operatorKey} " +
        "<if test='operationType != null and operationType != \"\"'>AND h.operation_type=#{operationType} </if>" +
        "UNION ALL SELECT o.id,CONCAT('RECEIVING_',o.action),s.container_no,'COMPLETED'," +
-        "CONCAT('柜号作业 ',s.container_no),s.customer_id,o.created_at " +
+        "CONCAT('柜号作业 ',s.container_no),NULL customer_id,o.created_at " +
        "FROM ll_receiving_container_operation o JOIN ll_receiving_container_session s ON s.id=o.session_id " +
        "WHERE s.overseas_warehouse_id=#{warehouseId} AND o.operator_key=#{operatorKey} " +
        "<if test='operationType != null and operationType != \"\"'>AND CONCAT('RECEIVING_',o.action)=#{operationType} </if>" +