Merge remote-tracking branch 'remotes/origin/master' into core_flow

air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air/a_a4_流程四_基础模块设置.py

@@ -9,7 +9,7 @@ from common.run_cmd_script import execute_command
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,spd_core1,a_a4_流程四_基础模块设置,id2302,id2302-4,sit,on
+case_tag:api,spd_core,a_a4_流程四_基础模块设置,id2302,id2302-4,sit,on
 主数据平台:a_a4_流程四_基础模块设置
 python runner_test.py tag id2302-4 debug mdm3
 

common/db/sql/sql_del_branch_info.py

@@ -130,18 +130,20 @@ class delData(object):
         connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2",
                                      charset="utf8")
         cursor = connection.cursor()
-        # 删除货位信息
-        sql = "delete from mcms_stock_shelf where shelf_no like '%自动化测试-2%';"
-        print(sql)
-        cursor.execute(sql)
-        cursor.execute("commit;")
-        print('货位信息删除成功 ')
-        # 删除库区信息
-        sql = "delete  from mcms_stock_shelf where shelf_name like '%自动化测试%';"
-        print(sql)
-        cursor.execute(sql)
-        cursor.execute("commit;")
-        print('库区信息删除成功 ')
+        #---暂时注释==================================
+        # # 删除货位信息
+        # sql = "delete from mcms_stock_shelf where shelf_no like '%自动化测试-2%';"
+        # print(sql)
+        # cursor.execute(sql)
+        # cursor.execute("commit;")
+        # print('货位信息删除成功 ')
+        # # 删除库区信息
+        # sql = "delete  from mcms_stock_shelf where shelf_name like '%自动化测试%';"
+        # print(sql)
+        # cursor.execute(sql)
+        # cursor.execute("commit;")
+        # print('库区信息删除成功 ')
+        #--暂时注释=====================================
         # 删除多余库房信息
         # sql = "delete  from mcms_stock_info where stock_name like '%东土城路院区_____中心库房';"
         # print(sql)

report/summary.html

@@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分8秒</td>
+            <td class='details-col-elapsed'>0分9秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td>
+            <td class="details-col-elapsed"><a href='../log/r_d4库房管理_库区设置_货位管理_添加货位/log.html' target='_blank'>r_d4库房管理_库区设置_货位管理_添加货位</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">8.705</td>
+            <td class="details-col-elapsed">8.912</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>