Explorar o código

序列号新增第10位显示值(序列号类型)

chenshibin %!s(int64=4) %!d(string=hai) anos
pai
achega
96beca62f3
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 2 2
      Controller/FileController.py
  2. 1 1
      Controller/SerialNumberController.py

+ 2 - 2
Controller/FileController.py

@@ -753,9 +753,9 @@ class DownloadSerialNumberFileView(View):
             # print(item)
             item = sn_qs[i]
             serial_number = item.serial_number
-            sheet1.write(num, 0, serial_number + mark + item.p2p)
+            sheet1.write(num, 0, serial_number + mark + str(item.p2p))
             num += 1
-            content += serial_number.strip() + mark + item.p2p
+            content += serial_number.strip() + mark + str(item.p2p)
             content += '\n'
 
             serialNumberModel = SerialNumberModel(

+ 1 - 1
Controller/SerialNumberController.py

@@ -260,6 +260,6 @@ class SerialNumberView(View):
                 if save_point:
                     transaction.savepoint_rollback(save_point)  # 事务回滚
             redisObject.rpush(key, value)
-            return response.json(0, {'serial_number': serial_number + mark + sn_qs[0].p2p, 'mac': mac})
+            return response.json(0, {'serial_number': serial_number + mark + str(sn_qs[0].p2p), 'mac': mac})
         else:
             return response.json(444)