diff --git a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
index ba413a9..e2ae92d 100644
--- a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
+++ b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
@@ -23,8 +23,6 @@ public interface PdaBindingMapper {
@Param("innerCode")String innerCode);
int countQualityRecordByCode(String code);
- @DataSource(value = DataSourceType.SLAVE)
- int updateCodeBinding(@Param("boxCode") String boxCode, @Param("innerCode")String innerCode);
int submitRepair(@Param("info")RepairSubmitInfoDto info);
@@ -73,4 +71,12 @@ public interface PdaBindingMapper {
String selectBoxNameBarCode(String boxCode);
+
+ @DataSource(value = DataSourceType.SLAVE)
+ int updateCodeBinding(@Param("boxCode") String boxCode, @Param("innerCode")String innerCode);
+
+ @DataSource(value = DataSourceType.SLAVE)
+ int insertCodeBinding(@Param("boxCode") String boxCode);
+
+
}
diff --git a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
index 89d044d..a9b73d9 100644
--- a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
+++ b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
@@ -59,7 +59,12 @@ public class PdaServiceImpl implements IPdaBindingService {
@Override
public int updateCodeBinding(String boxCode, String innerCode) {
- return mapper.updateCodeBinding(boxCode,innerCode);
+ int flag = mapper.updateCodeBinding(boxCode, innerCode);
+ if (flag == 0){
+ mapper.insertCodeBinding(boxCode);
+ flag = mapper.updateCodeBinding(boxCode, innerCode);
+ }
+ return flag;
}
/**
diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
index ff40d7e..b3143c2 100644
--- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
+++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
@@ -17,19 +17,24 @@
- INSERT INTO CODE_BINDING(OBJ_ID, BOX_CODE, BOX_NAME, LINER_CODE, BINDING_RESULT, RECORD_TIME1)
+ INSERT INTO C##AUCMA_SCADA.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 CODE_BINDING
- SET PRODUCT_CODE = #{innerCode}, BINDING_RESULT = '成功',RECORD_TIME2 = SYSDATE,IS_PASS= 1
+ UPDATE C##AUCMA_SCADA.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)
+ VALUES (SEQ_CODE_BINDING.nextval, #{boxCode})
+
+
UPDATE REPORT_QUALITY_INSPECTION
@@ -117,13 +122,11 @@
- UPDATE CODE_BINDING
+ UPDATE C##AUCMA_SCADA.CODE_BINDING
SET PRODUCT_CODE = NULL, RECORD_TIME2 = NULL
WHERE BOX_CODE = #{boxCode}
-
-
INSERT INTO PRINT_SUPPLEMENTBARCODE
@@ -144,4 +147,5 @@
#{PRINT_NAME},
+
\ No newline at end of file
diff --git a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
index a9e82ab..7ffa3ca 100644
--- a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
@@ -74,7 +74,7 @@
and line_no = #{lineNo}
and gongwno = #{gongwno}
and cpno = #{cpno}
- and cpmodel = #{cpmodel}
+ and cpmodel like concat(concat('%', #{cpmodel}), '%')
and factorymodel = #{factorymodel}
and voltage = #{voltage}
and point2 = #{point2}