diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
index cb04561..91c7314 100644
--- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
+++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
@@ -7,7 +7,7 @@
- INSERT INTO C##AUCMA_SCADA.CODE_BINDING(OBJ_ID, BOX_CODE, BOX_NAME, LINER_CODE, BINDING_RESULT, RECORD_TIME1)
+ INSERT INTO CODE_BINDING(OBJ_ID, BOX_CODE, BOX_NAME, LINER_CODE, BINDING_RESULT, RECORD_TIME1)
VALUES (SEQ_CODE_BINDING.nextval, #{boxCode}, #{boxName,jdbcType=NVARCHAR}, #{innerCode}, '成功', SYSDATE)
- UPDATE C##AUCMA_SCADA.CODE_BINDING
+ UPDATE CODE_BINDING
SET PRODUCT_CODE = #{innerCode}, BINDING_RESULT = '成功',RECORD_TIME2 = SYSDATE,IS_PASS= 1
where BOX_CODE = #{boxCode}
- INSERT INTO C##AUCMA_SCADA.CODE_BINDING(OBJ_ID, BOX_CODE)
+ INSERT INTO CODE_BINDING(OBJ_ID, BOX_CODE)
VALUES (SEQ_CODE_BINDING.nextval, #{boxCode})
@@ -88,8 +88,8 @@
OI.PRINT_NAME,
NVL(MIN(PS.IS_PRINT), 1) IS_PRINT
FROM BASE_ORDERINFO OI
- JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.ORDER_CODE = OI.ORDER_CODE
- LEFT JOIN C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE PS ON PS.MATERIAL_BARCODE = PB.MATERIAL_BARCODE
+ JOIN PRINT_BARCODE PB ON PB.ORDER_CODE = OI.ORDER_CODE
+ LEFT JOIN PRINT_SUPPLEMENTBARCODE PS ON PS.MATERIAL_BARCODE = PB.MATERIAL_BARCODE
WHERE PB.MATERIAL_BARCODE = #{boxCode}
GROUP BY PB.ORDER_CODE, PB.MATERIAL_CODE, PB.MATERIAL_NAME, PB.MATERIAL_BARCODE, PB.PRINT_BARTYPE,
OI.PRINT_NAME
@@ -130,14 +130,14 @@
RECORD_TIME1,
RECORD_TIME2,
LINER_CODE
- from C##AUCMA_SCADA.CODE_BINDING S
+ from CODE_BINDING S
WHERE LINER_CODE IS NOT NULL
AND BOX_CODE = #{boxCode}
- UPDATE C##AUCMA_SCADA.CODE_BINDING
+ UPDATE CODE_BINDING
SET PRODUCT_CODE = NULL, RECORD_TIME2 = NULL
WHERE BOX_CODE = #{boxCode}
diff --git a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
index b8828b5..8bde639 100644
--- a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
@@ -54,7 +54,7 @@
LEFT JOIN (SELECT PRODUCT_LINE_CODE,
TO_CHAR(PRODUCT_SCANTIME, 'YYYY-MM-DD') PRODUCT_SCANTIME,
COUNT(*) OFFLINE_SUM
- FROM C##AUCMA_SCADA.PRODUCT_OFFLINE
+ FROM PRODUCT_OFFLINE
GROUP BY PRODUCT_LINE_CODE, TO_CHAR(PRODUCT_SCANTIME, 'YYYY-MM-DD')) OL
ON PL.PRODUCT_LINE_CODE = OL.PRODUCT_LINE_CODE AND
PL.day_of_week = OL.PRODUCT_SCANTIME
@@ -130,7 +130,7 @@
DF.LOGIN_TEAM,
TO_CHAR(DF.RECORDTIME, 'HH24') RECORD_HOUR,
NVL(COUNT(*), 0) AMOUNT
- FROM C##AUCMA_SCADA.DATA_BOXFOAM_FIXTURECOMPLATE DF
+ FROM DATA_BOXFOAM_FIXTURECOMPLATE DF
CROSS JOIN (SELECT MIN(START_TIME) START_TIME, MAX(END_TIME) END_TIME, TEAM_NAME
FROM VIEW_CURRENT_TEAM_TIME
GROUP BY TEAM_NAME) CT
@@ -180,7 +180,7 @@
diff --git a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
index c7fb059..205850d 100644
--- a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
@@ -66,7 +66,7 @@
sync_datetime,
frequency,
PRODUCT_LINE_CODE
- from C##AUCMA_SCADA.box_temperaturehistory
+ from box_temperaturehistory
@@ -666,13 +666,13 @@
VMC.MATERIAL_BARCODE,
MAX(BE.EXECUTION_SORT) EXECUTION_SORT,
TO_CHAR(MAX(COMPLETE_DATE), 'YYYY-MM-DD HH24:MI:SS') COMPLETE_DATE
- FROM C##AUCMA_SCADA.MATERIAL_COMPLETION VMC
+ FROM MATERIAL_COMPLETION VMC
JOIN RECORD_INSTORE IE ON IE.STORE_CODE = 'PQK-001' AND VMC.MATERIAL_BARCODE = IE.BARCODE_CODE
LEFT JOIN BASE_PRODUCTLINE BE ON BE.PRODUCT_LINE_CODE = VMC.STATION_NAME
- LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE PB
+ LEFT JOIN PRINT_BARCODE PB
ON PRINT_BARTYPE = 1 AND VMC.MATERIAL_BARCODE = PB.MATERIAL_BARCODE
LEFT JOIN BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = PB.MATERIAL_CODE
- LEFT JOIN C##AUCMA_SCADA.PRODUCT_OFFLINE PO ON PO.BOX_CODE = PB.MATERIAL_BARCODE
+ LEFT JOIN PRODUCT_OFFLINE PO ON PO.BOX_CODE = PB.MATERIAL_BARCODE
WHERE PB.MATERIAL_BARCODE IS NOT NULL
AND PO.BOX_CODE IS NULL
-- AND VMC.COMPLETE_DATE > (SYSDATE - 7)
@@ -714,7 +714,7 @@
TARGET
FROM (SELECT PRODUCT_SCANTIME, COUNT(*) OFF_LINE_NUM
FROM (SELECT TO_CHAR(VPO.PRODUCT_SCANTIME, 'YYYY-MM-DD') PRODUCT_SCANTIME, VPO.BOX_CODE
- FROM C##AUCMA_SCADA.PRODUCT_OFFLINE VPO
+ FROM PRODUCT_OFFLINE VPO
WHERE VPO.BOX_CODE IS NOT NULL
AND VPO.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
@@ -947,7 +947,7 @@
IE.BARCODE_CODE,
MAX(IE.IN_STORE_TIME) IN_STORE_TIME
FROM RECORD_INSTORE IE
- JOIN C##AUCMA_SCADA.PRINT_BARCODE BC
+ JOIN PRINT_BARCODE BC
ON BC.MATERIAL_BARCODE = IE.BARCODE_CODE
JOIN BASE_ORDERINFO OI ON OI.ORDER_CODE = BC.ORDER_CODE
JOIN BASE_PRODUCTLINE PL ON PL.WORK_CENTER_CODE = OI.WORK_CENTER_CODE
@@ -961,9 +961,9 @@
GROUP BY OI.ORDER_CODE, OI.WORK_CENTER_CODE, BC.MATERIAL_CODE,
IE.BARCODE_CODE) OM
ON OM.ORDER_CODE = BO.ORDER_CODE AND OM.WORK_CENTER_CODE = BO.WORK_CENTER_CODE
- LEFT JOIN C##AUCMA_SCADA.PRODUCT_OFFLINE OL ON OL.BOX_CODE = OM.BARCODE_CODE
+ LEFT JOIN PRODUCT_OFFLINE OL ON OL.BOX_CODE = OM.BARCODE_CODE
LEFT JOIN REPORT_QUALITY_INSPECTION QI ON QI.PROCESS_RESULT = '报废重做' AND QI.BAR_CODE = OM.BARCODE_CODE
- LEFT JOIN C##AUCMA_SCADA.MATERIAL_COMPLETION MC ON MC.MATERIAL_BARCODE = OM.BARCODE_CODE
+ LEFT JOIN MATERIAL_COMPLETION MC ON MC.MATERIAL_BARCODE = OM.BARCODE_CODE
LEFT JOIN BASE_PRODUCTLINE PL ON PL.PRODUCT_LINE_CODE = MC.STATION_NAME
WHERE OL.BOX_CODE IS NULL
and BO.MATERIAL_CODE = #{productCode}
@@ -1050,7 +1050,7 @@
SELECT TO_CHAR(VPO.PRODUCT_SCANTIME, 'YYYY-MM-DD') PRODUCT_SCANTIME,
VPO.BOX_CODE
- FROM C##AUCMA_SCADA.PRODUCT_OFFLINE VPO
+ FROM PRODUCT_OFFLINE VPO
WHERE VPO.BOX_CODE IS NOT NULL
AND VPO.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
@@ -1118,7 +1118,7 @@
SELECT TO_CHAR(VPO.PRODUCT_SCANTIME, 'YYYY-MM-DD') PRODUCT_SCANTIME,
VPO.BOX_CODE
- FROM C##AUCMA_SCADA.PRODUCT_OFFLINE VPO
+ FROM PRODUCT_OFFLINE VPO
WHERE VPO.BOX_CODE IS NOT NULL
AND VPO.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
@@ -1162,11 +1162,11 @@
CB.RECORD_TIME1, -- 壳胆绑定时间
CB.PRODUCT_CODE, -- 产品SN码
CB.RECORD_TIME2 -- 产品SN码绑定时间
- FROM C##AUCMA_SCADA.CODE_BINDING CB
- LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE P1 ON P1.MATERIAL_BARCODE = CB.BOX_CODE
+ FROM CODE_BINDING CB
+ LEFT JOIN PRINT_BARCODE P1 ON P1.MATERIAL_BARCODE = CB.BOX_CODE
LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = P1.ORDER_CODE
LEFT JOIN BASE_PRODUCTLINE BP on BO.WORK_CENTER_CODE = BP.WORK_CENTER_CODE
- LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE P2 ON P2.MATERIAL_BARCODE = CB.LINER_CODE
+ LEFT JOIN PRINT_BARCODE P2 ON P2.MATERIAL_BARCODE = CB.LINER_CODE
AND BP.PRODUCT_LINE_CODE = #{productLineCode}
@@ -1199,7 +1199,7 @@
-
+
@@ -1235,7 +1235,7 @@
ELSE 0
END) AS finished_product_piling_count
FROM
- c##AUCMA_SCADA.MATERIAL_COMPLETION mc
+ MATERIAL_COMPLETION mc
LEFT JOIN
BASE_PRODUCTLINE bp ON mc.PRODUCT_LINE_CODE = bp.PRODUCT_LINE_CODE
LEFT JOIN
diff --git a/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml b/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml
index 534488e..b90876d 100644
--- a/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml
@@ -33,9 +33,9 @@
PS.create_by,
PB.PRODUCT_LINE_CODE,
CASE WHEN PS.IS_PRINT = '1' THEN '已打印' ELSE '未打印' END IS_PRINT
- FROM C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE PS
+ FROM PRINT_SUPPLEMENTBARCODE PS
LEFT JOIN BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = PS.MATERIAL_CODE
- LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = PS.MATERIAL_CODE
+ LEFT JOIN PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = PS.MATERIAL_CODE
- INSERT INTO C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE
+ INSERT INTO PRINT_SUPPLEMENTBARCODE
ORDER_CODE,MATERIAL_CODE,
diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
index 923a97c..3e528d6 100644
--- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
@@ -219,7 +219,7 @@
SYSDATE INSPECTOR_TIME,
0 REWORK_NUMBER,
1 IS_FLAG
- FROM C##AUCMA_SCADA.PRINT_BARCODE PB
+ FROM PRINT_BARCODE PB
JOIN BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE
JOIN BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2005%'
WHERE PB.MATERIAL_BARCODE = #{barcode}
@@ -237,7 +237,7 @@
SYSDATE INSPECTOR_TIME,
0 REWORK_NUMBER,
1 IS_FLAG
- FROM C##AUCMA_SCADA.PRINT_BARCODE PB
+ FROM PRINT_BARCODE PB
JOIN BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE
JOIN BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2105%'
WHERE PB.MATERIAL_BARCODE = #{barcode}