From 0e49d5331f2cd5abaad2517cb508b412391b0672 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 28 四月 2025 10:13:09 +0800
Subject: [PATCH] 双数据源
---
src/main/resources/mapper/asrs/WaitPakinMapper.xml | 0
src/main/resources/mapper/asrs/LocOwnerMapper.xml | 0
src/main/resources/mapper/asrs/RowLastnoMapper.xml | 0
src/main/resources/mapper/asrs/BasWrkStatusMapper.xml | 0
src/main/resources/mapper/asrs/DocTypeMapper.xml | 0
src/main/resources/mapper/asrs/BasProcessProceduresMapper.xml | 0
src/main/resources/mapper/asrs/BasWhsMapper.xml | 0
src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java | 9 +++++----
src/main/resources/mapper/asrs/OrderSettleMapper.xml | 0
src/main/resources/mapper/asrs/BasDevpMapper.xml | 0
src/main/resources/mapper/asrs/ApiMapper.xml | 0
src/main/resources/mapper/asrs/LocMastMapper.xml | 0
src/main/resources/mapper/asrs/ManLocDetlMapper.xml | 0
src/main/resources/mapper/asrs/TagMapper.xml | 0
src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java | 11 +++++------
src/main/resources/mapper/asrs/WrkLastnoMapper.xml | 0
src/main/resources/mapper/asrs/HostMapper.xml | 0
src/main/resources/mapper/asrs/ConfigMapper.xml | 0
src/main/resources/mapper/asrs/TrayCodeMapper.xml | 0
src/main/resources/mapper/asrs/SaasLogMapper.xml | 0
src/main/resources/mapper/asrs/BasWrkIotypeMapper.xml | 0
src/main/resources/mapper/asrs/WrkDetlLogMapper.xml | 0
src/main/resources/mapper/asrs/WrkMastLogMapper.xml | 0
src/main/resources/mapper/asrs/DocLogMapper.xml | 0
src/main/resources/mapper/asrs/LocCheckMapper.xml | 0
src/main/resources/mapper/asrs/OrderPakinMapper.xml | 0
src/main/resources/mapper/asrs/OperateLogMapper.xml | 0
src/main/resources/mapper/asrs/RolePermissionMapper.xml | 0
src/main/resources/mapper/asrs/BasCrnpMapper.xml | 0
src/main/resources/mapper/asrs/BasCrnErrorMapper.xml | 0
src/main/resources/mapper/asrs/BasCrnStatusMapper.xml | 0
src/main/resources/mapper/asrs/WrkMastFourWarVehicleLogMapper.xml | 0
src/main/resources/mapper/asrs/StkPlcmMapper.xml | 0
src/main/resources/mapper/asrs/UserLoginMapper.xml | 0
src/main/resources/mapper/asrs/ViewStayTimeMapper.xml | 0
src/main/resources/mapper/asrs/AdjDetlMapper.xml | 0
src/main/resources/mapper/asrs/StaDescMapper.xml | 0
src/main/resources/mapper/asrs/PermissionMapper.xml | 0
src/main/resources/mapper/asrs/RoleResourceMapper.xml | 0
src/main/resources/mapper/asrs/WrkMastFourWarVehicleMapper.xml | 0
src/main/resources/mapper/asrs/OrderDetlMapper.xml | 0
src/main/resources/mapper/asrs/WaitPakinLogMapper.xml | 0
src/main/resources/mapper/asrs/OrderPakoutMapper.xml | 0
src/main/resources/mapper/asrs/RequestLogMapper.xml | 0
src/main/resources/mapper/asrs/ResourceMapper.xml | 0
src/main/resources/mapper/asrs/BasCrnOptMapper.xml | 0
src/main/resources/mapper/asrs/PackMapper.xml | 0
src/main/resources/mapper/asrs/BasPlcerrorMapper.xml | 0
src/main/resources/mapper/asrs/OrderDetlPakinMapper.xml | 0
src/main/resources/mapper/asrs/BasLocStsMapper.xml | 0
src/main/resources/mapper/asrs/MatMapper.xml | 0
src/main/resources/mapper/asrs/WrkDetlMapper.xml | 0
src/main/resources/mapper/asrs/AutoMoveMapper.xml | 0
src/main/resources/mapper/asrs/RowLastnoTypeMapper.xml | 0
src/main/resources/mapper/asrs/WrkMastMapper.xml | 0
src/main/resources/mapper/asrs/ViewInOutMapper.xml | 0
src/main/resources/mapper/asrs/WrkMastExecuteLogMapper.xml | 0
src/main/java/com/zy/nc/entity/NccSaleXsckmx.java | 7 +++++--
src/main/resources/mapper/asrs/LocDetlMapper.xml | 0
src/main/resources/mapper/asrs/LocRuleMapper.xml | 0
src/main/resources/mapper/asrs/ViewStockUseMapper.xml | 0
src/main/resources/mapper/asrs/ViewWorkInMapper.xml | 0
src/main/resources/mapper/asrs/WrkMastExecuteMapper.xml | 0
src/main/resources/mapper/asrs/NodeMapper.xml | 0
src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml | 5 +++++
src/main/resources/mapper/asrs/BasErrLogMapper.xml | 0
src/main/resources/mapper/asrs/ApiLogMapper.xml | 0
src/main/resources/mapper/asrs/BasQualityTestingMapper.xml | 0
src/main/resources/mapper/asrs/OrderMapper.xml | 0
src/main/resources/mapper/asrs/UserMapper.xml | 0
src/main/resources/application.yml | 6 +-----
src/main/resources/mapper/asrs/RoleMapper.xml | 0
src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml | 0
73 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java b/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java
index 3471cac..dd4ea64 100644
--- a/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java
+++ b/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java
@@ -1,7 +1,6 @@
package com.zy.common.config.ds;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
+import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
@@ -18,13 +17,13 @@
@Bean(name = "primarySqlSessionFactory")
@Primary
- public SqlSessionFactory primarySqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception {
- SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+ public MybatisSqlSessionFactoryBean primarySqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception {
+ MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
sessionFactory.setDataSource(dataSource);
// 璁剧疆MyBatis鐨凪apper XML鏂囦欢璺緞
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
- .getResources("classpath:mapper/*.xml"));
- return sessionFactory.getObject();
+ .getResources("classpath:mapper/asrs/*.xml"));
+ return sessionFactory;
}
@Bean(name = "transactionManager")
diff --git a/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java b/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java
index 1327441..da48db4 100644
--- a/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java
+++ b/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java
@@ -1,5 +1,6 @@
package com.zy.common.config.ds;
+import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.annotation.MapperScan;
@@ -16,13 +17,13 @@
public class SecondaryDataSourceConfig {
@Bean(name = "secondarySqlSessionFactory")
- public SqlSessionFactory secondarySqlSessionFactory(@Qualifier("slaveDataSource") DataSource dataSource) throws Exception {
- SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+ public MybatisSqlSessionFactoryBean secondarySqlSessionFactory(@Qualifier("slaveDataSource") DataSource dataSource) throws Exception {
+ MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
sessionFactory.setDataSource(dataSource);
// 璁剧疆MyBatis鐨凪apper XML鏂囦欢璺緞
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
- .getResources("classpath:mapper/**/*.xml"));
- return sessionFactory.getObject();
+ .getResources("classpath:mapper/nc/*.xml"));
+ return sessionFactory;
}
@Bean(name = "secondaryTransactionManager")
diff --git a/src/main/java/com/zy/nc/entity/NccSaleXsckmx.java b/src/main/java/com/zy/nc/entity/NccSaleXsckmx.java
index 20d36cc..c97b64a 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleXsckmx.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleXsckmx.java
@@ -1,7 +1,9 @@
package com.zy.nc.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
@@ -11,7 +13,8 @@
@TableName("ncc_sale_xsckmx")
public class NccSaleXsckmx implements Serializable {
- @TableId
+ @TableId(value = "cgeneralbid", type = IdType.INPUT)
+ @TableField("cgeneralbid")
private String cgeneralbid;
private String cszzbm;
@@ -64,7 +67,7 @@
private String mlmc;
- private String wlu8Name;
+ private String wlu8name;
private String mlgg;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 93d46fb..e42144f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -33,11 +33,7 @@
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
-mybatis-plus:
- mapper-locations:
- - classpath:mapper/*.xml
- - classpath*:mapper2/*.xml
- type-aliases-package: com.zy.**
+
logging:
path: /stock/out/@pom.build.finalName@/logs
diff --git a/src/main/resources/mapper/AdjDetlMapper.xml b/src/main/resources/mapper/asrs/AdjDetlMapper.xml
similarity index 100%
rename from src/main/resources/mapper/AdjDetlMapper.xml
rename to src/main/resources/mapper/asrs/AdjDetlMapper.xml
diff --git a/src/main/resources/mapper/ApiLogMapper.xml b/src/main/resources/mapper/asrs/ApiLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ApiLogMapper.xml
rename to src/main/resources/mapper/asrs/ApiLogMapper.xml
diff --git a/src/main/resources/mapper/ApiMapper.xml b/src/main/resources/mapper/asrs/ApiMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ApiMapper.xml
rename to src/main/resources/mapper/asrs/ApiMapper.xml
diff --git a/src/main/resources/mapper/AutoMoveMapper.xml b/src/main/resources/mapper/asrs/AutoMoveMapper.xml
similarity index 100%
rename from src/main/resources/mapper/AutoMoveMapper.xml
rename to src/main/resources/mapper/asrs/AutoMoveMapper.xml
diff --git a/src/main/resources/mapper/BasCrnErrorMapper.xml b/src/main/resources/mapper/asrs/BasCrnErrorMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasCrnErrorMapper.xml
rename to src/main/resources/mapper/asrs/BasCrnErrorMapper.xml
diff --git a/src/main/resources/mapper/BasCrnOptMapper.xml b/src/main/resources/mapper/asrs/BasCrnOptMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasCrnOptMapper.xml
rename to src/main/resources/mapper/asrs/BasCrnOptMapper.xml
diff --git a/src/main/resources/mapper/BasCrnStatusMapper.xml b/src/main/resources/mapper/asrs/BasCrnStatusMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasCrnStatusMapper.xml
rename to src/main/resources/mapper/asrs/BasCrnStatusMapper.xml
diff --git a/src/main/resources/mapper/BasCrnpMapper.xml b/src/main/resources/mapper/asrs/BasCrnpMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasCrnpMapper.xml
rename to src/main/resources/mapper/asrs/BasCrnpMapper.xml
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/asrs/BasDevpMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasDevpMapper.xml
rename to src/main/resources/mapper/asrs/BasDevpMapper.xml
diff --git a/src/main/resources/mapper/BasErrLogMapper.xml b/src/main/resources/mapper/asrs/BasErrLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasErrLogMapper.xml
rename to src/main/resources/mapper/asrs/BasErrLogMapper.xml
diff --git a/src/main/resources/mapper/BasLocStsMapper.xml b/src/main/resources/mapper/asrs/BasLocStsMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasLocStsMapper.xml
rename to src/main/resources/mapper/asrs/BasLocStsMapper.xml
diff --git a/src/main/resources/mapper/BasPlcerrorMapper.xml b/src/main/resources/mapper/asrs/BasPlcerrorMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasPlcerrorMapper.xml
rename to src/main/resources/mapper/asrs/BasPlcerrorMapper.xml
diff --git a/src/main/resources/mapper/BasProcessProceduresMapper.xml b/src/main/resources/mapper/asrs/BasProcessProceduresMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasProcessProceduresMapper.xml
rename to src/main/resources/mapper/asrs/BasProcessProceduresMapper.xml
diff --git a/src/main/resources/mapper/BasQualityTestingMapper.xml b/src/main/resources/mapper/asrs/BasQualityTestingMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasQualityTestingMapper.xml
rename to src/main/resources/mapper/asrs/BasQualityTestingMapper.xml
diff --git a/src/main/resources/mapper/BasWhsMapper.xml b/src/main/resources/mapper/asrs/BasWhsMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasWhsMapper.xml
rename to src/main/resources/mapper/asrs/BasWhsMapper.xml
diff --git a/src/main/resources/mapper/BasWrkIotypeMapper.xml b/src/main/resources/mapper/asrs/BasWrkIotypeMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasWrkIotypeMapper.xml
rename to src/main/resources/mapper/asrs/BasWrkIotypeMapper.xml
diff --git a/src/main/resources/mapper/BasWrkStatusMapper.xml b/src/main/resources/mapper/asrs/BasWrkStatusMapper.xml
similarity index 100%
rename from src/main/resources/mapper/BasWrkStatusMapper.xml
rename to src/main/resources/mapper/asrs/BasWrkStatusMapper.xml
diff --git a/src/main/resources/mapper/ConfigMapper.xml b/src/main/resources/mapper/asrs/ConfigMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ConfigMapper.xml
rename to src/main/resources/mapper/asrs/ConfigMapper.xml
diff --git a/src/main/resources/mapper/DocLogMapper.xml b/src/main/resources/mapper/asrs/DocLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/DocLogMapper.xml
rename to src/main/resources/mapper/asrs/DocLogMapper.xml
diff --git a/src/main/resources/mapper/DocTypeMapper.xml b/src/main/resources/mapper/asrs/DocTypeMapper.xml
similarity index 100%
rename from src/main/resources/mapper/DocTypeMapper.xml
rename to src/main/resources/mapper/asrs/DocTypeMapper.xml
diff --git a/src/main/resources/mapper/HostMapper.xml b/src/main/resources/mapper/asrs/HostMapper.xml
similarity index 100%
rename from src/main/resources/mapper/HostMapper.xml
rename to src/main/resources/mapper/asrs/HostMapper.xml
diff --git a/src/main/resources/mapper/LocCheckMapper.xml b/src/main/resources/mapper/asrs/LocCheckMapper.xml
similarity index 100%
rename from src/main/resources/mapper/LocCheckMapper.xml
rename to src/main/resources/mapper/asrs/LocCheckMapper.xml
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
similarity index 100%
rename from src/main/resources/mapper/LocDetlMapper.xml
rename to src/main/resources/mapper/asrs/LocDetlMapper.xml
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/asrs/LocMastMapper.xml
similarity index 100%
rename from src/main/resources/mapper/LocMastMapper.xml
rename to src/main/resources/mapper/asrs/LocMastMapper.xml
diff --git a/src/main/resources/mapper/LocOwnerMapper.xml b/src/main/resources/mapper/asrs/LocOwnerMapper.xml
similarity index 100%
rename from src/main/resources/mapper/LocOwnerMapper.xml
rename to src/main/resources/mapper/asrs/LocOwnerMapper.xml
diff --git a/src/main/resources/mapper/LocRuleMapper.xml b/src/main/resources/mapper/asrs/LocRuleMapper.xml
similarity index 100%
rename from src/main/resources/mapper/LocRuleMapper.xml
rename to src/main/resources/mapper/asrs/LocRuleMapper.xml
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/asrs/ManLocDetlMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ManLocDetlMapper.xml
rename to src/main/resources/mapper/asrs/ManLocDetlMapper.xml
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/asrs/MatMapper.xml
similarity index 100%
rename from src/main/resources/mapper/MatMapper.xml
rename to src/main/resources/mapper/asrs/MatMapper.xml
diff --git a/src/main/resources/mapper/NodeMapper.xml b/src/main/resources/mapper/asrs/NodeMapper.xml
similarity index 100%
rename from src/main/resources/mapper/NodeMapper.xml
rename to src/main/resources/mapper/asrs/NodeMapper.xml
diff --git a/src/main/resources/mapper/OperateLogMapper.xml b/src/main/resources/mapper/asrs/OperateLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/OperateLogMapper.xml
rename to src/main/resources/mapper/asrs/OperateLogMapper.xml
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/asrs/OrderDetlMapper.xml
similarity index 100%
rename from src/main/resources/mapper/OrderDetlMapper.xml
rename to src/main/resources/mapper/asrs/OrderDetlMapper.xml
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/asrs/OrderDetlPakinMapper.xml
similarity index 100%
rename from src/main/resources/mapper/OrderDetlPakinMapper.xml
rename to src/main/resources/mapper/asrs/OrderDetlPakinMapper.xml
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml
similarity index 100%
rename from src/main/resources/mapper/OrderDetlPakoutMapper.xml
rename to src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/asrs/OrderMapper.xml
similarity index 100%
rename from src/main/resources/mapper/OrderMapper.xml
rename to src/main/resources/mapper/asrs/OrderMapper.xml
diff --git a/src/main/resources/mapper/OrderPakinMapper.xml b/src/main/resources/mapper/asrs/OrderPakinMapper.xml
similarity index 100%
rename from src/main/resources/mapper/OrderPakinMapper.xml
rename to src/main/resources/mapper/asrs/OrderPakinMapper.xml
diff --git a/src/main/resources/mapper/OrderPakoutMapper.xml b/src/main/resources/mapper/asrs/OrderPakoutMapper.xml
similarity index 100%
rename from src/main/resources/mapper/OrderPakoutMapper.xml
rename to src/main/resources/mapper/asrs/OrderPakoutMapper.xml
diff --git a/src/main/resources/mapper/OrderSettleMapper.xml b/src/main/resources/mapper/asrs/OrderSettleMapper.xml
similarity index 100%
rename from src/main/resources/mapper/OrderSettleMapper.xml
rename to src/main/resources/mapper/asrs/OrderSettleMapper.xml
diff --git a/src/main/resources/mapper/PackMapper.xml b/src/main/resources/mapper/asrs/PackMapper.xml
similarity index 100%
rename from src/main/resources/mapper/PackMapper.xml
rename to src/main/resources/mapper/asrs/PackMapper.xml
diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/asrs/PermissionMapper.xml
similarity index 100%
rename from src/main/resources/mapper/PermissionMapper.xml
rename to src/main/resources/mapper/asrs/PermissionMapper.xml
diff --git a/src/main/resources/mapper/RequestLogMapper.xml b/src/main/resources/mapper/asrs/RequestLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/RequestLogMapper.xml
rename to src/main/resources/mapper/asrs/RequestLogMapper.xml
diff --git a/src/main/resources/mapper/ResourceMapper.xml b/src/main/resources/mapper/asrs/ResourceMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ResourceMapper.xml
rename to src/main/resources/mapper/asrs/ResourceMapper.xml
diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/asrs/RoleMapper.xml
similarity index 100%
rename from src/main/resources/mapper/RoleMapper.xml
rename to src/main/resources/mapper/asrs/RoleMapper.xml
diff --git a/src/main/resources/mapper/RolePermissionMapper.xml b/src/main/resources/mapper/asrs/RolePermissionMapper.xml
similarity index 100%
rename from src/main/resources/mapper/RolePermissionMapper.xml
rename to src/main/resources/mapper/asrs/RolePermissionMapper.xml
diff --git a/src/main/resources/mapper/RoleResourceMapper.xml b/src/main/resources/mapper/asrs/RoleResourceMapper.xml
similarity index 100%
rename from src/main/resources/mapper/RoleResourceMapper.xml
rename to src/main/resources/mapper/asrs/RoleResourceMapper.xml
diff --git a/src/main/resources/mapper/RowLastnoMapper.xml b/src/main/resources/mapper/asrs/RowLastnoMapper.xml
similarity index 100%
rename from src/main/resources/mapper/RowLastnoMapper.xml
rename to src/main/resources/mapper/asrs/RowLastnoMapper.xml
diff --git a/src/main/resources/mapper/RowLastnoTypeMapper.xml b/src/main/resources/mapper/asrs/RowLastnoTypeMapper.xml
similarity index 100%
rename from src/main/resources/mapper/RowLastnoTypeMapper.xml
rename to src/main/resources/mapper/asrs/RowLastnoTypeMapper.xml
diff --git a/src/main/resources/mapper/SaasLogMapper.xml b/src/main/resources/mapper/asrs/SaasLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/SaasLogMapper.xml
rename to src/main/resources/mapper/asrs/SaasLogMapper.xml
diff --git a/src/main/resources/mapper/StaDescMapper.xml b/src/main/resources/mapper/asrs/StaDescMapper.xml
similarity index 100%
rename from src/main/resources/mapper/StaDescMapper.xml
rename to src/main/resources/mapper/asrs/StaDescMapper.xml
diff --git a/src/main/resources/mapper/StkPlcmMapper.xml b/src/main/resources/mapper/asrs/StkPlcmMapper.xml
similarity index 100%
rename from src/main/resources/mapper/StkPlcmMapper.xml
rename to src/main/resources/mapper/asrs/StkPlcmMapper.xml
diff --git a/src/main/resources/mapper/TagMapper.xml b/src/main/resources/mapper/asrs/TagMapper.xml
similarity index 100%
rename from src/main/resources/mapper/TagMapper.xml
rename to src/main/resources/mapper/asrs/TagMapper.xml
diff --git a/src/main/resources/mapper/TrayCodeMapper.xml b/src/main/resources/mapper/asrs/TrayCodeMapper.xml
similarity index 100%
rename from src/main/resources/mapper/TrayCodeMapper.xml
rename to src/main/resources/mapper/asrs/TrayCodeMapper.xml
diff --git a/src/main/resources/mapper/UserLoginMapper.xml b/src/main/resources/mapper/asrs/UserLoginMapper.xml
similarity index 100%
rename from src/main/resources/mapper/UserLoginMapper.xml
rename to src/main/resources/mapper/asrs/UserLoginMapper.xml
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/asrs/UserMapper.xml
similarity index 100%
rename from src/main/resources/mapper/UserMapper.xml
rename to src/main/resources/mapper/asrs/UserMapper.xml
diff --git a/src/main/resources/mapper/ViewInOutMapper.xml b/src/main/resources/mapper/asrs/ViewInOutMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ViewInOutMapper.xml
rename to src/main/resources/mapper/asrs/ViewInOutMapper.xml
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/asrs/ViewStayTimeMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ViewStayTimeMapper.xml
rename to src/main/resources/mapper/asrs/ViewStayTimeMapper.xml
diff --git a/src/main/resources/mapper/ViewStockUseMapper.xml b/src/main/resources/mapper/asrs/ViewStockUseMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ViewStockUseMapper.xml
rename to src/main/resources/mapper/asrs/ViewStockUseMapper.xml
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/asrs/ViewWorkInMapper.xml
similarity index 100%
rename from src/main/resources/mapper/ViewWorkInMapper.xml
rename to src/main/resources/mapper/asrs/ViewWorkInMapper.xml
diff --git a/src/main/resources/mapper/WaitPakinLogMapper.xml b/src/main/resources/mapper/asrs/WaitPakinLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WaitPakinLogMapper.xml
rename to src/main/resources/mapper/asrs/WaitPakinLogMapper.xml
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/asrs/WaitPakinMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WaitPakinMapper.xml
rename to src/main/resources/mapper/asrs/WaitPakinMapper.xml
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkDetlLogMapper.xml
rename to src/main/resources/mapper/asrs/WrkDetlLogMapper.xml
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkDetlMapper.xml
rename to src/main/resources/mapper/asrs/WrkDetlMapper.xml
diff --git a/src/main/resources/mapper/WrkLastnoMapper.xml b/src/main/resources/mapper/asrs/WrkLastnoMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkLastnoMapper.xml
rename to src/main/resources/mapper/asrs/WrkLastnoMapper.xml
diff --git a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml b/src/main/resources/mapper/asrs/WrkMastExecuteLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkMastExecuteLogMapper.xml
rename to src/main/resources/mapper/asrs/WrkMastExecuteLogMapper.xml
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/asrs/WrkMastExecuteMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkMastExecuteMapper.xml
rename to src/main/resources/mapper/asrs/WrkMastExecuteMapper.xml
diff --git a/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml b/src/main/resources/mapper/asrs/WrkMastFourWarVehicleLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml
rename to src/main/resources/mapper/asrs/WrkMastFourWarVehicleLogMapper.xml
diff --git a/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml b/src/main/resources/mapper/asrs/WrkMastFourWarVehicleMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml
rename to src/main/resources/mapper/asrs/WrkMastFourWarVehicleMapper.xml
diff --git a/src/main/resources/mapper/WrkMastLogMapper.xml b/src/main/resources/mapper/asrs/WrkMastLogMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkMastLogMapper.xml
rename to src/main/resources/mapper/asrs/WrkMastLogMapper.xml
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/asrs/WrkMastMapper.xml
similarity index 100%
rename from src/main/resources/mapper/WrkMastMapper.xml
rename to src/main/resources/mapper/asrs/WrkMastMapper.xml
diff --git a/src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml b/src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml
index 7998479..7a40514 100644
--- a/src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml
+++ b/src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml
@@ -2,6 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.nc.mapper.NccSaleXsckmxMapper">
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccSaleXsckmx">
+ <id column="cgeneralbid" property="cgeneralbid" />
+ </resultMap>
+
</mapper>
--
Gitblit v1.9.1