From b424d6493efb60cb8d93a2e16526086da1fc2ea9 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 16:08:11 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/CommandInfoLog.java | 2
src/main/webapp/static/wcs/js/common.js | 2
src/main/java/com/zy/asrs/entity/TaskWrk.java | 2
src/main/java/com/zy/asrs/entity/BasDevp.java | 2
src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java | 2
src/main/java/com/zy/asrs/entity/MatCode.java | 2
src/main/resources/mapper/LocDetlMapper.xml | 26 +-
src/main/resources/mapper/LocMastMapper.xml | 22 +-
src/main/java/com/zy/asrs/entity/BasWrkStatus.java | 2
src/main/java/com/zy/asrs/entity/BasCrnp.java | 2
pom.xml | 9 +
src/main/java/com/zy/asrs/entity/BasErrLog.java | 2
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 2
src/main/webapp/static/wms/js/common.js | 2
src/main/resources/mapper/WrkDetlMapper.xml | 8
src/main/java/com/zy/asrs/entity/WrkLastno.java | 2
src/main/webapp/static/wcs/js/console.map.js | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 2
src/main/resources/mapper/ViewInOutMapper.xml | 32 ++--
src/main/java/com/zy/asrs/entity/DataResource.java | 2
src/main/java/com/zy/asrs/entity/LocMast.java | 2
src/main/java/com/zy/asrs/entity/BasCrnStatus.java | 2
src/main/resources/mapper/CommandInfoMapper.xml | 20 +-
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 2
src/main/resources/mapper/DataResourceMapper.xml | 12
src/main/java/com/zy/asrs/entity/ApiConfig.java | 2
src/main/java/com/zy/asrs/entity/BasCrnOpt.java | 2
src/main/java/com/zy/asrs/entity/BasCrnError.java | 2
src/main/java/com/zy/asrs/entity/BasPlcerror.java | 2
src/main/java/com/zy/asrs/entity/WrkMast.java | 2
src/main/resources/mapper/WrkMastMapper.xml | 28 ++--
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 2
src/main/resources/mapper/TaskWrkMapper.xml | 108 +++++++-------
src/main/java/com/zy/asrs/entity/RowLastno.java | 2
src/main/java/com/zy/asrs/entity/ApiLog.java | 2
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 2
src/main/resources/mapper/ApiConfigMapper.xml | 6
src/main/resources/mapper/DeviceErrorMapper.xml | 12
src/main/java/com/zy/asrs/entity/WaitPakin.java | 2
src/main/java/com/zy/asrs/entity/LocDetl.java | 2
src/main/java/com/zy/asrs/entity/CommandInfo.java | 2
src/main/java/com/zy/asrs/entity/DeviceError.java | 2
src/main/resources/mapper/ConfigMapper.xml | 8
src/main/resources/mapper/BasDevpMapper.xml | 24 +-
src/main/java/com/zy/asrs/entity/BasLocSts.java | 2
src/main/resources/application.yml | 12 +
src/main/java/com/zy/asrs/entity/StaDesc.java | 2
47 files changed, 201 insertions(+), 192 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b3e5d3..2e3079b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.zy</groupId>
- <artifactId>wxwcs</artifactId>
+ <artifactId>wcs</artifactId>
<version>1.0.0</version>
<packaging>war</packaging>
@@ -32,6 +32,11 @@
<!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
+ <dependency>
+ <groupId>com.dameng</groupId>
+ <artifactId>DmJdbcDriver8</artifactId>
+ <version>8.1.3.162</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
@@ -200,7 +205,7 @@
</dependencies>
<build>
- <finalName>wxwcs</finalName>
+ <finalName>wcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/entity/ApiConfig.java b/src/main/java/com/zy/asrs/entity/ApiConfig.java
index 22c9703..8d02f37 100644
--- a/src/main/java/com/zy/asrs/entity/ApiConfig.java
+++ b/src/main/java/com/zy/asrs/entity/ApiConfig.java
@@ -21,7 +21,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_api_config")
+@TableName("\"SOURCE\".\"wcs_api_config\"")
public class ApiConfig implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/ApiLog.java b/src/main/java/com/zy/asrs/entity/ApiLog.java
index 78fa188..73b86a2 100644
--- a/src/main/java/com/zy/asrs/entity/ApiLog.java
+++ b/src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -15,7 +15,7 @@
import java.io.Serializable;
@Data
-@TableName("man_api_log")
+@TableName("\"SOURCE\".\"man_api_log\"")
public class ApiLog implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/asrs/entity/BasCrnError.java
index 8702140..d6ff938 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_crn_error")
+@TableName("\"SOURCE\".\"asr_bas_crn_error\"")
public class BasCrnError implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
index ed98925..0b57310 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_crn_opt")
+@TableName("\"SOURCE\".\"asr_bas_crn_opt\"")
public class BasCrnOpt implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
index a0d44cf..30c7aec 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_crn_status")
+@TableName("\"SOURCE\".\"asr_bas_crn_status\"")
public class BasCrnStatus implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 0f37f95..56ab945 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -16,7 +16,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_crnp")
+@TableName("\"SOURCE\".\"asr_bas_crnp\"")
public class BasCrnp implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index a7e3309..6e7bf88 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -16,7 +16,7 @@
import java.util.Date;
@Data
-@TableName("asr_bas_devp")
+@TableName("\"SOURCE\".\"asr_bas_devp\"")
public class BasDevp implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index f135e6b..77e6214 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_err_log")
+@TableName("\"SOURCE\".\"asr_bas_err_log\"")
public class BasErrLog implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasLocSts.java b/src/main/java/com/zy/asrs/entity/BasLocSts.java
index 13d16b9..f6a5fb2 100644
--- a/src/main/java/com/zy/asrs/entity/BasLocSts.java
+++ b/src/main/java/com/zy/asrs/entity/BasLocSts.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_loc_sts")
+@TableName("\"SOURCE\".\"asr_bas_loc_sts\"")
public class BasLocSts implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
index f8f681e..079724f 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerror.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_plcerror")
+@TableName("\"SOURCE\".\"asr_bas_plcerror\"")
public class BasPlcerror implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
index 8cf8b8a..27f3ecb 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
@@ -31,7 +31,7 @@
import java.io.Serializable;
@Data
-@TableName("asr_bas_plcerror_log")
+@TableName("\"SOURCE\".\"asr_bas_plcerror_log\"")
public class BasPlcerrorLog implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
index 91fb456..13a5ec6 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_wrk_iotype")
+@TableName("\"SOURCE\".\"asr_bas_wrk_iotype\"")
public class BasWrkIotype implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
index c02168d..726387e 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_wrk_status")
+@TableName("\"SOURCE\".\"asr_bas_wrk_status\"")
public class BasWrkStatus implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfo.java b/src/main/java/com/zy/asrs/entity/CommandInfo.java
index e49b7bc..e453846 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfo.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -15,7 +15,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_command_info")
+@TableName("\"SOURCE\".\"wcs_command_info\"")
public class CommandInfo implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
index 31bdbbf..d08e69c 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_command_info_log")
+@TableName("\"SOURCE\".\"wcs_command_info_log\"")
public class CommandInfoLog implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/DataResource.java b/src/main/java/com/zy/asrs/entity/DataResource.java
index 417bec6..697e826 100644
--- a/src/main/java/com/zy/asrs/entity/DataResource.java
+++ b/src/main/java/com/zy/asrs/entity/DataResource.java
@@ -13,7 +13,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_data_resource")
+@TableName("\"SOURCE\".\"wcs_data_resource\"")
public class DataResource implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/DeviceError.java b/src/main/java/com/zy/asrs/entity/DeviceError.java
index aab93f0..ebbd105 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceError.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceError.java
@@ -13,7 +13,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_device_error")
+@TableName("\"SOURCE\".\"wcs_device_error\"")
public class DeviceError implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 87c44d8..beeafce 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -16,7 +16,7 @@
import java.util.Date;
@Data
-@TableName("asr_loc_detl")
+@TableName("\"SOURCE\".\"asr_loc_detl\"")
public class LocDetl implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 8495902..140a012 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -17,7 +17,7 @@
import java.util.Date;
@Data
-@TableName("asr_loc_mast")
+@TableName("\"SOURCE\".\"asr_loc_mast\"")
public class LocMast implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index e6f8431..17438b0 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("bas_mat_code")
+@TableName("\"SOURCE\".\"bas_mat_code\"")
public class MatCode implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 07107cd..33a7d05 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_row_lastno")
+@TableName("\"SOURCE\".\"asr_row_lastno\"")
public class RowLastno implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index e0c8241..c6e0a06 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -17,7 +17,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_sta_desc")
+@TableName("\"SOURCE\".\"asr_sta_desc\"")
public class StaDesc implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 246fcaf..15cb346 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -34,7 +34,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_task_wrk")
+@TableName("\"SOURCE\".\"wcs_task_wrk\"")
public class TaskWrk implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index b0f0bef..812206d 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -32,7 +32,7 @@
import java.io.Serializable;
@Data
-@TableName("wcs_task_wrk_log")
+@TableName("\"SOURCE\".\"wcs_task_wrk_log\"")
public class TaskWrkLog implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 572f0f8..c68b9d7 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -11,7 +11,7 @@
import java.util.Date;
@Data
-@TableName("cust_wait_pakin")
+@TableName("\"SOURCE\".\"cust_wait_pakin\"")
public class WaitPakin implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 7f3abc4..431d710 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -15,7 +15,7 @@
import java.util.Date;
@Data
-@TableName("asr_wrk_detl")
+@TableName("\"SOURCE\".\"asr_wrk_detl\"")
public class WrkDetl implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index da098cd..6214131 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -14,7 +14,7 @@
import java.util.Date;
@Data
-@TableName("asr_wrk_detl_log")
+@TableName("\"SOURCE\".\"asr_wrk_detl_log\"")
public class WrkDetlLog implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/asrs/entity/WrkLastno.java
index 514079f..9e32e36 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/asrs/entity/WrkLastno.java
@@ -14,7 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_wrk_lastno")
+@TableName("\"SOURCE\".\"asr_wrk_lastno\"")
public class WrkLastno implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index db2e4c4..ee0851b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -21,7 +21,7 @@
import java.util.List;
@Data
-@TableName("asr_wrk_mast")
+@TableName("\"SOURCE\".\"asr_wrk_mast\"")
public class WrkMast implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index e542a25..9d83c7a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -18,7 +18,7 @@
import java.util.Date;
@Data
-@TableName("asr_wrk_mast_log")
+@TableName("\"SOURCE\".\"asr_wrk_mast_log\"")
public class WrkMastLog implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e39ec59..871e27f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,10 +7,14 @@
application:
name: @pom.build.finalName@
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
- username: sa
- password: sa@123
+# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
+# username: sa
+# password: sa@123
+ driver-class-name: dm.jdbc.driver.DmDriver
+ url: jdbc:dm://192.168.4.191:5236/SOURCE
+ username: SYSDBA
+ password: Zy@12345
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/ApiConfigMapper.xml b/src/main/resources/mapper/ApiConfigMapper.xml
index 76cb29f..2d084f0 100644
--- a/src/main/resources/mapper/ApiConfigMapper.xml
+++ b/src/main/resources/mapper/ApiConfigMapper.xml
@@ -16,9 +16,9 @@
</resultMap>
<select id="selectByUrl" resultMap="BaseResultMap">
- select top 1 * from wcs_api_config
- where url = #{url}
- order by create_time desc
+ select top 1 * from "SOURCE"."wcs_api_config"
+ where "url" = #{url}
+ order by "create_time" desc
</select>
</mapper>
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 8d739c9..d5385ee 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -47,24 +47,24 @@
<select id="getAvailableInSite" resultType="java.lang.Integer">
select
- abd.dev_no
- from asr_bas_devp abd
- left join asr_sta_desc asd on abd.dev_no = asd.stn_no
+ abd."dev_no"
+ from "SOURCE"."asr_bas_devp" abd
+ left join "SOURCE"."asr_sta_desc" asd on abd."dev_no" = asd."stn_no"
where 1=1
- and asd.type_no = #{typeNo}
- and abd.in_enable = 'Y'
- group by abd.dev_no
+ and asd."type_no" = #{typeNo}
+ and abd."in_enable" = 'Y'
+ group by abd."dev_no"
</select>
<select id="getAvailableOutSite" resultType="java.lang.Integer">
select
- abd.dev_no
- from asr_bas_devp abd
- left join asr_sta_desc asd on abd.dev_no = asd.stn_no
+ abd."dev_no"
+ from "SOURCE"."asr_bas_devp" abd
+ left join "SOURCE"."asr_sta_desc" asd on abd."dev_no" = asd."stn_no"
where 1=1
- and asd.type_no = #{typeNo}
- and abd.out_enable = 'Y'
- group by abd.dev_no
+ and asd."type_no" = #{typeNo}
+ and abd."out_enable" = 'Y'
+ group by abd."dev_no"
</select>
</mapper>
diff --git a/src/main/resources/mapper/CommandInfoMapper.xml b/src/main/resources/mapper/CommandInfoMapper.xml
index e2158ff..7e03ed8 100644
--- a/src/main/resources/mapper/CommandInfoMapper.xml
+++ b/src/main/resources/mapper/CommandInfoMapper.xml
@@ -19,25 +19,25 @@
</resultMap>
<select id="selectByTaskNoAndWrkNo" resultMap="BaseResultMap">
- select * from wcs_command_info
- where wrk_no = #{wrkNo}
- and task_no = #{taskNo}
+ select * from "SOURCE"."wcs_command_info"
+ where "wrk_no" = #{wrkNo}
+ and "task_no" = #{taskNo}
</select>
<select id="selectByWrkNo" resultMap="BaseResultMap">
- select * from wcs_command_info
- where wrk_no = #{wrkNo}
+ select * from "SOURCE"."wcs_command_info"
+ where "wrk_no" = #{wrkNo}
</select>
<select id="selectByTaskNo" resultMap="BaseResultMap">
- select * from wcs_command_info
- where task_no = #{taskNo}
+ select * from "SOURCE"."wcs_command_info"
+ where "task_no" = #{taskNo}
</select>
<select id="selectCompleteManualCommand" resultMap="BaseResultMap">
- select * from wcs_command_info
- where command_type = 2
- and command_status = 3
+ select * from "SOURCE"."wcs_command_info"
+ where "command_type" = 2
+ and "command_status" = 3
</select>
</mapper>
diff --git a/src/main/resources/mapper/ConfigMapper.xml b/src/main/resources/mapper/ConfigMapper.xml
index 8dd9f7d..57d2b13 100644
--- a/src/main/resources/mapper/ConfigMapper.xml
+++ b/src/main/resources/mapper/ConfigMapper.xml
@@ -14,13 +14,13 @@
</resultMap>
<select id="selectByCode" resultMap="BaseResultMap">
- select top 1 * from sys_config
- where code = #{code}
+ select top 1 * from "SOURCE"."sys_config"
+ where "code" = #{code}
</select>
<select id="selectByCodes" resultMap="BaseResultMap">
- select * from sys_config
- where code in
+ select * from "SOURCE"."sys_config"
+ where "code" in
<foreach item="item" collection="codes" index="index" separator="," open="(" close=")">
#{item}
</foreach>
diff --git a/src/main/resources/mapper/DataResourceMapper.xml b/src/main/resources/mapper/DataResourceMapper.xml
index 9b0a4a4..13330fb 100644
--- a/src/main/resources/mapper/DataResourceMapper.xml
+++ b/src/main/resources/mapper/DataResourceMapper.xml
@@ -14,18 +14,18 @@
</resultMap>
<select id="selectRootData" resultMap="BaseResultMap">
- select * from wcs_data_resource
- where resource_id is null
+ select * from "SOURCE"."wcs_data_resource"
+ where "resource_id" is null
</select>
<select id="selectByResourceId" resultMap="BaseResultMap">
- select * from wcs_data_resource
- where resource_id = #{resourceId}
+ select * from "SOURCE"."wcs_data_resource"
+ where "resource_id" = #{resourceId}
</select>
<select id="selectAll" resultMap="BaseResultMap">
- select * from wcs_data_resource
- order by name
+ select * from "SOURCE"."wcs_data_resource"
+ order by "name"
</select>
</mapper>
diff --git a/src/main/resources/mapper/DeviceErrorMapper.xml b/src/main/resources/mapper/DeviceErrorMapper.xml
index 7f6e4f2..69fc924 100644
--- a/src/main/resources/mapper/DeviceErrorMapper.xml
+++ b/src/main/resources/mapper/DeviceErrorMapper.xml
@@ -13,15 +13,15 @@
</resultMap>
<select id="selectByDeviceAndDeviceId" resultMap="BaseResultMap">
- select top 1 * from wcs_device_error
- where device = #{device}
- and device_id = #{deviceId}
+ select top 1 * from "SOURCE"."wcs_device_error"
+ where "device" = #{device}
+ and "device_id" = #{deviceId}
</select>
<delete id="deleteByDeviceAndDeviceId">
- delete from wcs_device_error
- where device = #{device}
- and device_id = #{deviceId}
+ delete from "SOURCE"."wcs_device_error"
+ where "device" = #{device}
+ and "device_id" = #{deviceId}
</delete>
</mapper>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 4fb3cbf..6a11c33 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -48,22 +48,22 @@
<sql id="stockOutCondition">
<if test="loc_no!=null and loc_no!='' ">
- and a.loc_no like '%' + #{loc_no} + '%'
+ and a."loc_no" like '%' + #{loc_no} + '%'
</if>
<if test="matNo!=null and matNo!='' ">
- and a.matnr like '%' + #{matNo} + '%'
+ and a."matnr" like '%' + #{matNo} + '%'
</if>
<if test="matName!=null and matName!='' ">
- and a.maktx like '%' + #{matName} + '%'
+ and a."maktx" like '%' + #{matName} + '%'
</if>
<if test="anfme!=null and anfme!='' ">
- and a.anfme like '%' + #{anfme} + '%'
+ and a."anfme" like '%' + #{anfme} + '%'
</if>
<if test="altme!=null and altme!='' ">
- and a.altme like '%' + #{altme} + '%'
+ and a."altme" like '%' + #{altme} + '%'
</if>
<if test="startTime!=null and endTime!=null">
- and a.modi_time between #{startTime} and #{endTime}
+ and a."modi_time" between #{startTime} and #{endTime}
</if>
</sql>
@@ -71,12 +71,12 @@
select * from
(
select
- ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
+ ROW_NUMBER() over (order by a."appe_time",a."matnr",a."loc_no") as row,
a.*
- from asr_loc_detl a
- left join asr_loc_mast b on a.loc_no = b.loc_no
+ from "SOURCE"."asr_loc_detl" a
+ left join "SOURCE"."asr_loc_mast" b on a."loc_no" = b."loc_no"
where 1=1
- and b.loc_sts = 'F'
+ and b."loc_sts" = 'F'
<include refid="stockOutCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -84,10 +84,10 @@
<select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
select
count(1)
- from asr_loc_detl a
- left join asr_loc_mast b on a.loc_no = b.loc_no
+ from "SOURCE"."asr_loc_detl" a
+ left join "SOURCE"."asr_loc_mast" b on a."loc_no" = b."loc_no"
where 1=1
- and b.loc_sts = 'F'
+ and b."loc_sts" = 'F'
<include refid="stockOutCondition"></include>
</select>
</mapper>
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 19d8f6e..252ea41 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -40,32 +40,32 @@
<select id="queryFreeLocMast" resultMap="BaseResultMap">
select top 1 *
- from asr_loc_mast
- where row1=#{row}
- and loc_sts='O'
+ from "SOURCE"."asr_loc_mast"
+ where "row1"=#{row}
+ and "loc_sts"='O'
<if test="locType1 != null">
- and loc_type1 = #{locType1}
+ and "loc_type1" = #{locType1}
</if>
- order by NEWID(),lev1 asc,bay1 asc
+ order by NEWID(),"lev1" asc,"bay1" asc
</select>
<select id="queryDemoSourceLoc" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast where crn_no = #{crnNo}
- and loc_sts='D'
+ select top 1 * from "SOURCE"."asr_loc_mast" where "crn_no" = #{crnNo}
+ and "loc_sts"='D'
ORDER BY NEWID()
</select>
<select id="queryDemoLoc" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'
+ select top 1 * from "SOURCE"."asr_loc_mast" where "crn_no" = #{crnNo} and "loc_sts" = 'O'
ORDER BY NEWID()
</select>
<select id="selectByLocNo" resultMap="BaseResultMap">
- select * from asr_loc_mast
- where loc_no = #{locNo}
+ select * from "SOURCE"."asr_loc_mast"
+ where "loc_no" = #{locNo}
</select>
<select id="selectLocByLev" resultMap="BaseResultMap">
- SELECT * FROM asr_loc_mast WHERE lev1 = #{lev}
+ SELECT * FROM "SOURCE"."asr_loc_mast" WHERE "lev1" = #{lev}
</select>
</mapper>
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 81fae90..6b92fe3 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -30,109 +30,109 @@
</resultMap>
<select id="selectByTaskNo" resultMap="BaseResultMap">
- select top 1 * from wcs_task_wrk
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and task_no = #{taskNo}
+ and "task_no" = #{taskNo}
</select>
<select id="selectByStartPoint" resultMap="BaseResultMap">
- select top 1 * from wcs_task_wrk
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and io_type=3
- and start_point = #{startPoint}
+ and "io_type"=3
+ and "start_point" = #{startPoint}
</select>
<select id="selectByWrkNo" resultMap="BaseResultMap">
- select top 1 * from wcs_task_wrk
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and wrk_no = #{wrkNo}
+ and "wrk_no" = #{wrkNo}
</select>
<select id="selectPakIn" resultMap="BaseResultMap">
- select top 1 * from dbo.wcs_task_wrk
- where status=1
- and crn_no=#{crnNo}
- and wrk_no=#{workNo}
- and start_point=#{startPoint}
- and io_type=1
- order by io_pri desc,create_time,wrk_no ASC
+ select top 1 * from "SOURCE"."wcs_task_wrk"
+ where "status"=1
+ and "crn_no"=#{crnNo}
+ and "wrk_no"=#{workNo}
+ and "start_point"=#{startPoint}
+ and "io_type"=1
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectReceive" resultMap="BaseResultMap">
- select * from wcs_task_wrk
+ select * from "SOURCE"."wcs_task_wrk"
where 1=1
- and status = 1
+ and "status" = 1
</select>
<select id="selectPakOutIoType" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
- where crn_no=#{crnNo}
- and io_type = 3
- order by io_pri desc,create_time,wrk_no ASC
+ select * from "SOURCE"."wcs_task_wrk"
+ where "crn_no"=#{crnNo}
+ and "io_type" = 3
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectCrnStaWorking" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
- where crn_no=#{crnNo}
- and target_point=#{targetPoint}
- and wrk_sts=13
- and io_type = 2
- order by io_pri desc,create_time,wrk_no ASC
+ select * from "SOURCE"."wcs_task_wrk"
+ where "crn_no"=#{crnNo}
+ and "target_point"=#{targetPoint}
+ and "wrk_sts"=13
+ and "io_type" = 2
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectPakOut" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
- where crn_no=#{crnNo}
+ select * from "SOURCE"."wcs_task_wrk"
+ where "crn_no"=#{crnNo}
<if test="targetPoint!=null and targetPoint!='' ">
- and target_point=#{targetPoint}
+ and "target_point"=#{targetPoint}
</if>
- and wrk_sts=11
- and io_type = 2
- order by io_pri desc,create_time,wrk_no ASC
+ and "wrk_sts"=11
+ and "io_type" = 2
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectPakOut3" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
- where crn_no=#{crnNo}
+ select * from "SOURCE"."wcs_task_wrk"
+ where "crn_no"=#{crnNo}
-- and target_point=#{targetPoint}
- and wrk_sts=11
- and io_type = 3
- order by io_pri desc,create_time ASC
+ and "wrk_sts"=11
+ and "io_type" = 3
+ order by "io_pri" desc,"create_time" ASC
</select>
<select id="selectCrnWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.wcs_task_wrk
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and (wrk_sts=3 or wrk_sts=12)
- and crn_no=#{crnNo}
- order by io_pri desc,create_time,wrk_no ASC
+ and ("wrk_sts"=3 or "wrk_sts"=12)
+ and "crn_no"=#{crnNo}
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectCrnNoInWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.wcs_task_wrk
+ select top 1 * from "SOURCE"."wcs_task_wrk"
where 1=1
- and (wrk_sts=3 or wrk_sts=12)
- and crn_no=#{crnNo}
- and wrk_no=#{workNo}
- order by io_pri desc,create_time,wrk_no ASC
+ and ("wrk_sts"=3 or "wrk_sts"=12)
+ and "crn_no"=#{crnNo}
+ and "wrk_no"=#{workNo}
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
+ select * from "SOURCE"."wcs_task_wrk"
where 1=1
- and ((wrk_sts=14 and status=5) or status=7 or status=4 or (wrk_sts=4 and status=5))
- order by io_pri desc,create_time,wrk_no ASC
+ and (("wrk_sts"=14 and "status"=5) or "status"=7 or "status"=4 or ("wrk_sts"=4 and "status"=5))
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
<insert id="saveToHistory">
- insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=5 or status=4 or status=6)
+ insert into "SOURCE"."wcs_task_wrk_log" select * from "SOURCE"."wcs_task_wrk" where "task_no" = #{taskNo} and ("status"=5 or "status"=4 or "status"=6)
</insert>
<select id="selectWorkingTask" resultMap="BaseResultMap">
- select * from dbo.wcs_task_wrk
- where (wrk_sts=3 and io_type = 1)
- or (wrk_sts=12 and io_type = 2)
- order by io_pri desc,create_time,wrk_no ASC
+ select * from "SOURCE"."wcs_task_wrk"
+ where ("wrk_sts"=3 and "io_type" = 1)
+ or ("wrk_sts"=12 and "io_type" = 2)
+ order by "io_pri" desc,"create_time","wrk_no" ASC
</select>
</mapper>
diff --git a/src/main/resources/mapper/ViewInOutMapper.xml b/src/main/resources/mapper/ViewInOutMapper.xml
index 8152776..82fdcf9 100644
--- a/src/main/resources/mapper/ViewInOutMapper.xml
+++ b/src/main/resources/mapper/ViewInOutMapper.xml
@@ -6,16 +6,16 @@
<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
<sql id="viewInOutConditionSql">
<if test="source_sta_no!=null and source_sta_no!='' ">
- and source_sta_no like '%' + #{source_sta_no} + '%'
+ and "source_sta_no" like '%' + #{source_sta_no} + '%'
</if>
<if test="begin_date!=null and begin_date!='' ">
<![CDATA[
- and ymd >= #{begin_date}
+ and "ymd" >= #{begin_date}
]]>
</if>
<if test="end_date!=null and end_date!='' ">
<![CDATA[
- and ymd <= #{end_date}
+ and "ymd" <= #{end_date}
]]>
</if>
</sql>
@@ -23,8 +23,8 @@
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
<select id="queryViewInOutList" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean">
select * from (
-select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
- from asr_sta_inout_view
+select *,ROW_NUMBER() OVER(Order by "ymd" desc) as rowid
+ from "SOURCE"."asr_sta_inout_view"
<where>
1=1
<include refid="viewInOutConditionSql"></include>
@@ -39,7 +39,7 @@
</select>
<select id="getViewInOutCount" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="Integer">
-select count(1) from asr_sta_inout_view a
+select count(1) from "SOURCE"."asr_sta_inout_view" a
<where>
<![CDATA[
1=1
@@ -50,33 +50,33 @@
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
<select id="getViewInOutAll" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean">
-select * from asr_sta_inout_view a
+select * from "SOURCE"."asr_sta_inout_view" a
<where>
<![CDATA[
1=1
]]>
<include refid="viewInOutConditionSql"></include>
<![CDATA[
- order by ymd desc
+ order by "ymd" desc
]]>
</where>
</select>
<select id="selectWorkCountInSum" resultType="java.lang.Integer">
- SELECT SUM(anfme) FROM asr_wrkin_count_view WHERE 1=1 AND
- (oneday > #{start}
+ SELECT SUM(anfme) FROM"SOURCE". "asr_wrkin_count_view" WHERE 1=1 AND
+ ("oneday" > #{start}
AND
- oneday < #{end})
+ "oneday" < #{end})
<if test="matnr != null and matnr !=''">
- and matnr = #{matnr}
+ and "matnr" = #{matnr}
</if>
</select>
<select id="selectWorkCountOutSum" resultType="java.lang.Integer">
- SELECT SUM(anfme) FROM asr_wrkout_count_view WHERE 1=1 AND
- (oneday > #{start}
+ SELECT SUM("anfme") FROM "SOURCE"."asr_wrkout_count_view" WHERE 1=1 AND
+ ("oneday" > #{start}
AND
- oneday < #{end})
+ "oneday" < #{end})
<if test="matnr != null and matnr !=''">
- and matnr = #{matnr}
+ and "matnr" = #{matnr}
</if>
</select>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index a28c05b..fd16ec7 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -27,14 +27,14 @@
</resultMap>
<select id="findByWorkNo" resultMap="BaseResultMap">
- select wrk_no, matnr, maktx, anfme from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
+ select "wrk_no", "matnr", "maktx", "anfme" from "SOURCE"."asr_wrk_detl" where 1=1 and "wrk_no" = #{workNo}
</select>
<update id="updateIoTime">
- update asr_wrk_detl
- set io_time = #{ioTime}
+ update "SOURCE"."asr_wrk_detl"
+ set "io_time" = #{ioTime}
where 1=1
- and wrk_no = #{workNo}
+ and "wrk_no" = #{workNo}
</update>
</mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 32279a3..d454ada 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -64,44 +64,44 @@
</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 top 1 * from "SOURCE"."asr_wrk_mast" where "source_loc_no" = #{sourceLocNo} and ("ctn_no" is null or "ctn_no" != 'Y')
</select>
<select id="selectByLocNo1" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
+ select top 1 * from "SOURCE"."asr_wrk_mast" where "source_loc_no" = #{sourceLocNo} or "loc_no" = #{sourceLocNo}
</select>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
- select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
+ select * from "SOURCE"."asr_wrk_mast" where (("wrk_sts" = 4 Or "wrk_sts" = 14 ) and "io_type" != 103 and "io_type" != 104 and "io_type" != 107 ) or ("wrk_sts" = 2 and "io_type"=6) order by "upd_mk","io_time","wrk_no"
</select>
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where wrk_sts=5
- 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 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 * from "SOURCE"."asr_wrk_mast"
+ where "wrk_sts"=5
+ or ("wrk_sts"=15 and "ove_mk"='Y' and "wrk_no" not in (select "wrk_no" from "SOURCE"."asr_bas_devp"))
+ or ("wrk_sts"=15 and dateadd(mi,15,"crn_end_time") <= getdate() and "wrk_no" not in (select "wrk_no" from "SOURCE"."asr_bas_devp"))
+ or ("wrk_sts"=15 and "crn_end_time" is null and "wrk_no" not in (select "wrk_no" from "SOURCE"."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 top 1 * from "SOURCE"."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 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 top 1 * from "SOURCE"."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>
<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 top 1 * from "SOURCE"."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>
<select id="selectPakInStep3" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
+ select top 1 * from "SOURCE"."asr_wrk_mast" where "wrk_no"=#{workNo}
</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 top 1 * from "SOURCE"."asr_wrk_mast" where "barcode"=#{barcode} and "wrk_sts"=14 and ("io_type"=103 or "io_type"=107 or "io_type"=104)
</select>
<select id="selectPakOutStep1" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/wcs/js/common.js b/src/main/webapp/static/wcs/js/common.js
index 3fe5057..dd0efd0 100644
--- a/src/main/webapp/static/wcs/js/common.js
+++ b/src/main/webapp/static/wcs/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/wxwcs";
+var baseUrl = "/wcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/wcs/js/console.map.js b/src/main/webapp/static/wcs/js/console.map.js
index 8bd0ad1..87a04c1 100644
--- a/src/main/webapp/static/wcs/js/console.map.js
+++ b/src/main/webapp/static/wcs/js/console.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "wxwcs",
+ "mapName": "wcs",
"rackCount": 13,
"crnCount": 4,
"stbCount": 4,
diff --git a/src/main/webapp/static/wms/js/common.js b/src/main/webapp/static/wms/js/common.js
index a163565..fcb5b63 100644
--- a/src/main/webapp/static/wms/js/common.js
+++ b/src/main/webapp/static/wms/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/wxwcs";
+var baseUrl = "/wcs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1