From d0226747665355acecd5b4f2b5c0beb020586729 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 17 一月 2025 15:37:32 +0800
Subject: [PATCH] # 23. PDA拣货单据，勾选或点击确认按钮后，完成当前单据 （已完成） 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 28. 平库已组拖数据，组拖完成后依然可组拖 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复） 34. cacheSite缓存站点逻辑需重新梳理，入库生成波次时（已完成） 35. PDA添加发货确认，默认全选 （已修复） 36. 大屏获取任务时，是由容器到达的拖盘码确认通知 （已修复） 37. 拣货单序号不显示 问题修复 （已修复） 42. pda发货确认，添加不同颜色区分是否全部完成拣货，绿色全部拣货完成，红色完成部分拣货（已修复） 43. CTU入库完成后，订单明细没有删除，执行中数量清空（已修复） 44. 平库入库完成后，历史档明细完成数量没有更新 （已修复） 45. PDA料号不显示 （已修复） 46. 发货完成后，波次管理数据未加入历史档 （已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java | 205 +++++++++++++++++++++++++++-----------------------
1 files changed, 110 insertions(+), 95 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
index 652e886..cc9c658 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
@@ -1,95 +1,110 @@
-package com.zy.asrs.wms.common.config;
-
-import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
-import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import com.zy.asrs.wms.system.entity.User;
-import com.zy.asrs.wms.system.entity.UserLogin;
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.LongValue;
-import net.sf.jsqlparser.expression.NullValue;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import java.util.Arrays;
-
-/**
- * MybatisPlus閰嶇疆
- *
- * @author vincent
- * @since 2018-02-22 11:29:28
- */
-@Configuration
-public class MybatisPlusConfig {
-
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-
- TenantLineHandler tenantLineHandler = new TenantLineHandler() {
-
- @Override
- public Expression getTenantId() {
- return getLoginUserTenantId();
- }
-
- @Override
- public String getTenantIdColumn() {
- return "host_id";
- }
-
- @Override
- public boolean ignoreTable(String tableName) {
- return Arrays.asList(
- "sys_host",
- "sys_user_role",
- "sys_role_menu",
- "sys_language",
- "view_man_loc_detl_field"
- ).contains(tableName);
- }
-
- };
- TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(tenantLineHandler);
- interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
-
- PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
- interceptor.addInnerInterceptor(paginationInnerInterceptor);
-
- return interceptor;
- }
-
- /**
- * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鐨勭鎴穒d
- *
- * @return Integer
- */
- public Expression getLoginUserTenantId() {
- try {
- Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- if (authentication != null) {
- Object object = authentication.getPrincipal();
- if (object instanceof User) {
- return new LongValue(((User) object).getHostId());
- }
- if (object instanceof UserLogin) {
- return new LongValue(((UserLogin) object).getHostId());
- }
- }
- } catch (Exception e) {
- System.out.println(e.getMessage());
- }
- return new NullValue();
- }
-
- @Bean
- public ConfigurationCustomizer mybatisConfigurationCustomizer(){
- return configuration -> configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory());
- }
-
-}
+package com.zy.asrs.wms.common.config;
+
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
+import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import com.zy.asrs.wms.common.interceptor.DataChangeInterceptor;
+import com.zy.asrs.wms.system.entity.User;
+import com.zy.asrs.wms.system.entity.UserLogin;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
+import net.sf.jsqlparser.expression.NullValue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import java.util.Arrays;
+
+/**
+ * MybatisPlus閰嶇疆
+ *
+ * @author vincent
+ * @since 2018-02-22 11:29:28
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+
+ @Bean
+ public MybatisPlusInterceptor mybatisPlusInterceptor() {
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+
+ TenantLineHandler tenantLineHandler = new TenantLineHandler() {
+
+ @Override
+ public Expression getTenantId() {
+ return getLoginUserTenantId();
+ }
+
+ @Override
+ public String getTenantIdColumn() {
+ return "host_id";
+ }
+
+ @Override
+ public boolean ignoreTable(String tableName) {
+ return Arrays.asList(
+ "sys_host",
+ "sys_user_role",
+ "sys_role_menu",
+ "sys_language",
+ "man_loc_sts",
+ "man_task_sts",
+ "man_task_type",
+ "man_order_settle",
+ "view_man_loc_detl_field",
+ "sys_cache_statistics"
+ ).contains(tableName);
+ }
+
+ };
+ TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(tenantLineHandler);
+ interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
+
+ PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+ interceptor.addInnerInterceptor(paginationInnerInterceptor);
+
+
+ return interceptor;
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鐨勭鎴穒d
+ *
+ * @return Integer
+ */
+ public Expression getLoginUserTenantId() {
+ try {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication != null) {
+ Object object = authentication.getPrincipal();
+ if (object instanceof User) {
+ return new LongValue(((User) object).getHostId());
+ }
+ if (object instanceof UserLogin) {
+ return new LongValue(((UserLogin) object).getHostId());
+ }
+ } else {
+ return new LongValue(1);
+ }
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ }
+// return new NullValue();
+ return new LongValue(1);
+ }
+
+ @Bean
+ public ConfigurationCustomizer mybatisConfigurationCustomizer() {
+ return configuration -> configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory());
+ }
+
+ @Bean
+ public DataChangeInterceptor sqlStatementInterceptor() {
+ return new DataChangeInterceptor();
+ }
+
+}
--
Gitblit v1.9.1