From 732ea41c1bcd1623068d46db64f88e36abe3dcb9 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期一, 20 四月 2026 15:25:37 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 14 +-
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 14 +-
src/main/java/com/zy/system/mapper/OperateLogMapper.java | 2
src/main/resources/mapper/WrkMastMapper.xml | 117 +++++++++++++++--------------
src/main/resources/mapper/ApiLogMapper.xml | 2
pom.xml | 7 -
src/main/java/com/zy/common/CodeBuilder.java | 13 +--
src/main/resources/application.yml | 12 +-
8 files changed, 87 insertions(+), 94 deletions(-)
diff --git a/pom.xml b/pom.xml
index badbd05..a5c8e69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<properties>
<java.version>1.8</java.version>
<cool.version>3.2.0</cool.version>
- <mysql-driver.version>5.1.47</mysql-driver.version>
+ <mysql-driver.version>8.0.33</mysql-driver.version>
<mybatis-plus.version>2.3.2</mybatis-plus.version>
<fastjson.version>1.2.58</fastjson.version>
<springfox.version>2.7.0</springfox.version>
@@ -45,11 +45,6 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-driver.version}</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
- <version>8.2.2.jre8</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index bd14d54..4fe7d28 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -16,29 +16,29 @@
@Select("select \n" +
"Min(wm.io_time) as node,\n" +
- "isnull(count(1), 0) as val\n" +
+ "IFNULL(count(1), 0) as val\n" +
"from asr_wrk_mast_log wm\n" +
"where wm.wrk_sts = 5 \n" +
"and (wm.io_type = 1 OR wm.io_type = 54)\n" +
- "and datediff(d, wm.io_time, getdate())<=7 \n" +
- "group by datediff(day,wm.io_time,getdate())\n" +
+ "and TIMESTAMPDIFF(DAY, wm.io_time, NOW())<=7 \n" +
+ "group by TIMESTAMPDIFF(DAY, wm.io_time, NOW())\n" +
"order by Min(wm.io_time) asc\n")
List<Map<String, Object>> queryPakinRep();
@Select("select\n" +
"Min(wm.io_time) as node,\n" +
- "isnull(count(1), 0) as val\n" +
+ "IFNULL(count(1), 0) as val\n" +
"from asr_wrk_mast_log wm\n" +
"where 1=1\n" +
"and ((wm.wrk_sts = 15 AND wm.io_type = 101) OR (wm.wrk_sts = 14 AND wm.io_type = 103))\n" +
- "and datediff(d, wm.io_time, getdate())<=7\n" +
- "group by datediff(day,wm.io_time,getdate())\n" +
+ "and TIMESTAMPDIFF(DAY, wm.io_time, NOW())<=7\n" +
+ "group by TIMESTAMPDIFF(DAY, wm.io_time, NOW())\n" +
"order by Min(wm.io_time) asc")
List<Map<String, Object>> queryPakOutRep();
//鏇茬嚎鍥�
@Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from asr_sta_inout_view "
- + "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
+ + "where ymd>DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -12 DAY), '%Y-%m-%d') group by ymd order by ymd")
public List<WorkChartAxis> getChartAxis();
@Select("select * from asr_loc_use_view")
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index a00872f..ba4801b 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -25,7 +25,7 @@
// wcs ---------------------------------------------
// 鍏ュ簱绗竴姝ワ紝鎵爜浠幏鍙栨潯鐮佷俊鎭椂鏌ヨ
-// @Select("select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC")
+// @Select("select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC LIMIT 1")
WrkMast selectPakInStep1(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
WrkMast selectPakInStep111(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
@@ -33,7 +33,7 @@
WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
// 鍏ュ簱绗簩姝ワ紝褰撴墭鐩樼墿鏂欏湪鍫嗗灈鏈哄叆搴撶珯鏃舵椂鏌ヨ
-// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC")
+// @Select("select * from asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC LIMIT 1")
WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
/**
@@ -44,7 +44,7 @@
List<WrkMast> selectPakInStep12(@Param("crnNo")Integer crnNo);
// 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
-// @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
+// @Select("select * from asr_wrk_mast where wrk_no=#{workNo} LIMIT 1")
WrkMast selectPakInStep3(@Param("workNo")Integer workNo);
WrkMast selectWrkMastUnstackingOne212();
@@ -52,22 +52,22 @@
WrkMast selectPakInStep5(@Param("staNo")Integer staNo,@Param("sheetNo")String sheetNo);
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
-// @Select("select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)")
+// @Select("select * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104) LIMIT 1")
WrkMast selectPickStep(@Param("barcode")String barcode);
// 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
-// @Select("select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
+// @Select("select * from asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc LIMIT 1")
WrkMast selectPakOutStep1(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
// 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
-// @Select("select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
+// @Select("select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC LIMIT 1")
WrkMast selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectPakOutStep2345(@Param("sourceStaNo")Integer sourceStaNo,@Param("workNo")Integer workNo);
WrkMast selectPakOutStep3(@Param("sourceStaNo")Integer sourceStaNo);
// 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
-// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
+// @Select("select * from asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no LIMIT 1")
WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 18cc29a..4e8d5ee 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -11,15 +11,10 @@
public static void main(String[] args) throws Exception {
CoolGenerator generator = new CoolGenerator();
// mysql
-// generator.url="localhost:3306/cool";
-// generator.username="root";
-// generator.password="xltys1995";
-// generator.table="sys_host";
- // sqlserver
- generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="127.0.0.1:50948;databasename=gdhmasrs";
- generator.username="sa";
- generator.password="sa@123";
+ generator.sqlOsType = SqlOsType.MYSQL;
+ generator.url="localhost:3306/gdhmasrs";
+ generator.username="root";
+ generator.password="root";
generator.table="asr_bas_devp_position";
generator.packagePath="com.zy.asrs";
diff --git a/src/main/java/com/zy/system/mapper/OperateLogMapper.java b/src/main/java/com/zy/system/mapper/OperateLogMapper.java
index d002d10..c02d74b 100644
--- a/src/main/java/com/zy/system/mapper/OperateLogMapper.java
+++ b/src/main/java/com/zy/system/mapper/OperateLogMapper.java
@@ -14,7 +14,7 @@
@Repository
public interface OperateLogMapper extends BaseMapper<OperateLog> {
- @Select("select count(1) from sys_operate_log where yearweek(date_format(create_time,'%Y-%m-%d')) = yearweek(now());")
+ @Select("select count(1) from sys_operate_log where yearweek(date_format(create_time,'%Y-%m-%d')) = yearweek(now())")
int selectCountByCurrentWeek();
@Select("select MONTH(create_time) as node , count(1) as val from sys_operate_log where 1 = 1 and year(create_time) = #{year} group by MONTH(create_time)")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f9e58de..9f11636 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,12 +7,10 @@
application:
name: @pom.build.finalName@
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://127.0.0.1:50751;databasename=rscar
-# url: jdbc:sqlserver://127.0.0.1:50948;databasename=gdhmasrs
- url: jdbc:sqlserver://192.168.4.196:62316;databasename=gdhmasrs
- username: sa
- password: sa@123
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/gdhmasrs?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
+ username: root
+ password: root
mvc:
static-path-pattern: /**
redis:
@@ -22,6 +20,8 @@
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
+ configuration:
+ map-underscore-to-camel-case: true
logging:
path: /stock/out/@pom.build.finalName@/logs
diff --git a/src/main/resources/mapper/ApiLogMapper.xml b/src/main/resources/mapper/ApiLogMapper.xml
index b6b6566..c382bdc 100644
--- a/src/main/resources/mapper/ApiLogMapper.xml
+++ b/src/main/resources/mapper/ApiLogMapper.xml
@@ -25,7 +25,7 @@
<delete id="clearWeekBefore">
delete from man_api_log
where 1=1
- and datediff(week,create_time,getdate()) >= 1
+ and TIMESTAMPDIFF(WEEK, create_time, NOW()) >= 1
and result != 1
</delete>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index a805e5e..0f0db40 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -67,11 +67,11 @@
</resultMap>
<select id="selectByLocNo" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and (ctn_no is null or ctn_no != 'Y')
+ select * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and (ctn_no is null or ctn_no != 'Y') LIMIT 1
</select>
<select id="selectByLocNo1" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
+ select * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo} LIMIT 1
</select>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
@@ -82,84 +82,84 @@
select * from asr_wrk_mast
where wrk_sts=4
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and DATE_ADD(crn_end_time, INTERVAL 15 MINUTE) <= NOW() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
<select id="selectPakInStep1" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+ select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC LIMIT 1
</select>
<select id="selectPakInStep111" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and barcode=#{barcode} and ((io_type = 202 and wrk_sts=51) or (io_type=1 and wrk_sts=2)) order by io_pri desc,io_time,wrk_no ASC
+ select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and barcode=#{barcode} and ((io_type = 202 and wrk_sts=51) or (io_type=1 and wrk_sts=2)) order by io_pri desc,io_time,wrk_no ASC LIMIT 1
</select>
<select id="selectPakInStep11" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+ select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC LIMIT 1
</select>
<select id="selectPakInStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select * from asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC LIMIT 1
</select>
<select id="selectPakInStep12" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select * from asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
+ select * from asr_wrk_mast where wrk_no=#{workNo} LIMIT 1
</select>
<select id="selectPakInStep4" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no=#{sheetNo}
+ select * from asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no=#{sheetNo} LIMIT 1
</select>
<select id="selectPakInStep5" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no!=#{sheetNo}
+ select * from asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no!=#{sheetNo} LIMIT 1
</select>
<select id="selectPickStep" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
+ select * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104) LIMIT 1
</select>
<select id="selectPakOutStep1" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select * from asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc LIMIT 1
</select>
<select id="selectPakOutStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC LIMIT 1
</select>
<select id="selectPakOutStep2345" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select * from asr_wrk_mast where wrk_no=#{workNo} and source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC LIMIT 1
</select>
<select id="selectPakOutStep3" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and io_type=10
+ select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and io_type=10 LIMIT 1
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no LIMIT 1
</select>
<select id="selectLocMoving" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no LIMIT 1
</select>
<select id="selectWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no LIMIT 1
</select>
<!-- <!– 鍏ュ簱浠诲姟 –>-->
<!-- <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
-<!-- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
+<!-- select * from asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no LIMIT 1-->
<!-- </select>-->
<!-- <!– 鍑哄簱浠诲姟 –>-->
<!-- <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
-<!-- select top 1 *-->
-<!-- from dbo.asr_wrk_mast-->
+<!-- select *-->
+<!-- from asr_wrk_mast-->
<!-- where (wrk_sts in (11,12)-->
<!-- or (wrk_sts in (14,15) and wrk_no in-->
<!-- (-->
@@ -173,33 +173,33 @@
<!-- </select>-->
<select id="selectCrnWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no LIMIT 1
</select>
<select id="selectDevWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts=2 and crn_no=#{crnNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where 1=1 and wrk_sts=2 and crn_no=#{crnNo} order by io_time,wrk_no LIMIT 1
</select>
<select id="selectPick" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where 1=1 and wrk_sts = 14 and io_type in (103,104,107)
+ select * from asr_wrk_mast where 1=1 and wrk_sts = 14 and io_type in (103,104,107)
</select>
<select id="selectPakOutStep11" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select * from asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
<select id="selectPakOutStep12" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select * from asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
<!-- 鍏ュ嚭搴撴ā寮忕浉鍏� -->
<select id="selectWorkingPakin" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no LIMIT 1
</select>
<select id="selectWorkingPakout" resultMap="BaseResultMap">
- select top 1 *
- from dbo.asr_wrk_mast
+ select *
+ from asr_wrk_mast
where (wrk_sts in (11,12)
or (wrk_sts in (14,15) and wrk_no in
(
@@ -210,17 +210,18 @@
and io_type != 11
and source_sta_no = #{sourceStaNo}
order by io_time,wrk_no
+ LIMIT 1
</select>
<select id="selectPakoutEmpty" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no LIMIT 1
</select>
<select id="selectExistInEmpty" resultType="java.lang.Integer">
- SELECT COUNT(*) FROM dbo.asr_wrk_mast Where io_type = 10 and wrk_sts in (1,2,3)
+ SELECT COUNT(*) FROM asr_wrk_mast Where io_type = 10 and wrk_sts in (1,2,3)
</select>
<!-- RGV璋冨害鍏ュ嚭搴撶浉鍏� -->
<select id="selectRgvInStep1" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast
+ select * from asr_wrk_mast
where rgv_no=#{rgvNo} and rgv_ssta_no in
<foreach item="item" collection="staNos" index="index" separator="," open="(" close=")">
#{item}
@@ -230,23 +231,23 @@
</select>
<select id="selectRgvInStep2" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where rgv_dsta_no=#{rgvInDStn} and wrk_sts=7 and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time desc,wrk_no ASC
+ select * from asr_wrk_mast where rgv_dsta_no=#{rgvInDStn} and wrk_sts=7 and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectRgvInWorking" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (6,7) and rgv_no=#{rgvNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where 1=1 and wrk_sts in (6,7) and rgv_no=#{rgvNo} order by io_time,wrk_no
</select>
<select id="selectRgvOutStep2" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where rgv_dsta_no=#{rgvOutDStn} and wrk_sts=17 and io_type > 100 order by io_pri desc,io_time desc,wrk_no ASC
+ select * from asr_wrk_mast where rgv_dsta_no=#{rgvOutDStn} and wrk_sts=17 and io_type > 100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectRgvDestStep2" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where rgv_dsta_no=#{rgvDestStn} and wrk_sts in (7,17) order by io_pri desc,io_time desc,wrk_no ASC
+ select * from asr_wrk_mast where rgv_dsta_no=#{rgvDestStn} and wrk_sts in (7,17) order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectRgvOutStep1" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast
+ select * from asr_wrk_mast
where rgv_no=#{rgvNo} and rgv_ssta_no in
<foreach item="item" collection="staNos" index="index" separator="," open="(" close=")">
#{item}
@@ -256,40 +257,40 @@
</select>
<select id="selectRgvOutWorking" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (16,17) and rgv_no=#{rgvNo} order by io_time,wrk_no
+ select * from asr_wrk_mast where 1=1 and wrk_sts in (16,17) and rgv_no=#{rgvNo} order by io_time,wrk_no
</select>
<!-- RGV璋冨害鍏ュ嚭搴撶浉鍏� -->
<!-- ==============================================RGV浠诲姟缁戝畾鐩稿叧 ============================================== -->
<select id="selectWaitBindRGV" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast
+ select * from asr_wrk_mast
where 1=1
and wrk_sts in (2,14)
and rgv_no is null
</select>
<select id="selectWaitBindRgvNo2" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast
+ select * from asr_wrk_mast
where 1=1
and wrk_sts in (2,14)
and (rgv_no IS NULL OR rgv_no = 0)
</select>
<select id="selectWaitBindRGVRgvNo" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast_rgv
+ select * from asr_wrk_mast_rgv
where 1=1
and wrk_sts < 110
and rgv_no = #{rgvNo}
</select>
<select id="selectWaitBindRgvNoOneWrkNo" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast_rgv
+ select * from asr_wrk_mast_rgv
where 1=1
and wrk_no = #{wrkNo}
</select>
<insert id="insertRgvMast">
- INSERT INTO dbo.asr_wrk_mast_rgv SELECT * FROM asr_wrk_mast WHERE wrk_no = #{wrkNo}
+ INSERT INTO asr_wrk_mast_rgv SELECT * FROM asr_wrk_mast WHERE wrk_no = #{wrkNo}
</insert>
<update id="updateRgvMast">
@@ -300,15 +301,15 @@
</update>
<select id="selectRgvInSteWrkNo" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts =12 and wrk_no=#{wrkNo} and rgv_no is null
+ select * from asr_wrk_mast where 1=1 and wrk_sts =12 and wrk_no=#{wrkNo} and rgv_no is null LIMIT 1
</select>
<select id="selectRgvOutSteWrkNo" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts =24 and wrk_no=#{wrkNo} and rgv_no is null
+ select * from asr_wrk_mast where 1=1 and wrk_sts =24 and wrk_no=#{wrkNo} and rgv_no is null LIMIT 1
</select>
<select id="selectIoRgvNo" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast
+ select * from asr_wrk_mast
where 1=1
and wrk_sts in (2,4,23,25)
and rgv_no = #{rgvNo}
@@ -316,60 +317,62 @@
</select>
<select id="selectRgvInSteNo" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts =14 and rgv_no=#{rgvNo}
+ select * from asr_wrk_mast where 1=1 and wrk_sts =14 and rgv_no=#{rgvNo}
<if test="rgvNo == 1">
order by rgv_dsta_no
</if>
<if test="rgvNo == 2">
order by rgv_dsta_no desc
</if>
+ LIMIT 1
</select>
<select id="selectRgvOutSteNo" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts =24 and rgv_no=#{rgvNo}
+ select * from asr_wrk_mast where 1=1 and wrk_sts =24 and rgv_no=#{rgvNo}
<if test="rgvNo == 1">
order by rgv_dsta_no
</if>
<if test="rgvNo == 2">
order by rgv_dsta_no desc
</if>
+ LIMIT 1
</select>
<!-- ==============================================RGV浠诲姟缁戝畾鐩稿叧 ============================================== -->
<!-- ==============================================鑷姩琛ョ┖鏉跨浉鍏� ============================================== -->
<!-- <select id="selectDischargingMachineOutputTray" resultMap="BaseResultMap">-->
-<!-- select * from dbo.asr_wrk_mast where 1=1 and io_type = 201-->
+<!-- select * from asr_wrk_mast where 1=1 and io_type = 201-->
<!-- </select>-->
<!-- <select id="selectStackingCompletionDriveTray" resultMap="BaseResultMap">-->
-<!-- select * from dbo.asr_wrk_mast where 1=1 and io_type = 201 and wrk_sts = 43-->
+<!-- select * from asr_wrk_mast where 1=1 and io_type = 201 and wrk_sts = 43-->
<!-- </select>-->
<!-- <select id="selectConfigCount10468N" resultType="java.lang.Integer">-->
-<!-- SELECT COUNT(1) FROM dbo.sys_config Where 1=1 and id=10468 and value = 'N'-->
+<!-- SELECT COUNT(1) FROM sys_config Where 1=1 and id=10468 and value = 'N'-->
<!-- </select>-->
<!-- ==============================================鑷姩琛ョ┖鏉跨浉鍏� ============================================== -->
<select id="selectWrkMastUnstackingOne202" resultMap="BaseResultMap">
- SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =51 and source_sta_no = #{sourceStaNo}
+ SELECT * FROM asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =51 and source_sta_no = #{sourceStaNo} LIMIT 1
</select>
<select id="selectWrkMastUnstackingOne202Two" resultMap="BaseResultMap">
- SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =52 and source_sta_no = #{sourceStaNo}
+ SELECT * FROM asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =52 and source_sta_no = #{sourceStaNo} LIMIT 1
</select>
<select id="selectWrkMastUnstackingOne145" resultMap="BaseResultMap">
- SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=1 and wrk_sts =2 and sheet_no='4' and source_sta_no = #{sourceStaNo}
+ SELECT * FROM asr_wrk_mast Where 1=1 and io_type=1 and wrk_sts =2 and sheet_no='4' and source_sta_no = #{sourceStaNo} LIMIT 1
</select>
<select id="selectWrkMastLabelingOne54" resultMap="BaseResultMap">
- SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =54
+ SELECT * FROM asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =54 LIMIT 1
</select>
<select id="selectWrkMastUnstackingOne212" resultMap="BaseResultMap">
- SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=212 and sta_no =212
+ SELECT * FROM asr_wrk_mast Where 1=1 and io_type=212 and sta_no =212 LIMIT 1
</select>
</mapper>
--
Gitblit v1.9.1