java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: stabilize overseas initialization and PDA acceptance

Browse Source
This commit is contained in:
ouyangxq
2026-09-10 10:25:16 +08:00
parent 37a28b9c11
commit e72e74b21e
12 changed files with 160 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/main/java/com/baiyue/lastleg/pda/warehouse/mapper/PdaWarehouseMapper.java
+1 -1
View File
@@ -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>" +
lastleg-service/src/main/java/com/baiyue/lastleg/security/OverseasPermissions.java
+2
View File
@@ -15,6 +15,8 @@ public final class OverseasPermissions {
public static final String RELABEL_ORDER_LIST = "platform:overseas-warehouse:relabel-order:list";
public static final String RELABEL_ORDER_CREATE = "platform:overseas-warehouse:relabel-order:create";
public static final String RELABEL_ORDER_STATUS = "platform:overseas-warehouse:relabel-order:status";
public static final String RETURN_INVENTORY_LIST = "platform:overseas-warehouse:return-inventory:list";
public static final String RETURN_CARTONS_LIST = "platform:overseas-warehouse:return-cartons:list";
public static final String INVENTORY_LIST = "platform:overseas-warehouse:inventory:list";
public static final String INVENTORY_EXPORT = "platform:overseas-warehouse:inventory:export";
public static final String INVENTORY_EDIT = "platform:overseas-warehouse:inventory:edit";