序列号新增第10位显示值（序列号类型）

Controller/FileController.py

@@ -649,6 +649,7 @@ class DownloadSerialNumberFileView(View):
         checksum = request_dict.get('checksum', None)
         ic_model = request_dict.get('ic_model', None)
         order_quantity = request_dict.get('order_quantity', None)
+        company_id = request_dict.get('company_id', None)
         response = ResponseObject()
 
         # print(area)
@@ -657,7 +658,7 @@ class DownloadSerialNumberFileView(View):
         if token.code != 0:
             return response.json(token.code)
 
-        if not area or not order_number or not board or not plan or not checksum or not ic_model or not order_quantity or not fileType:
+        if not area or not order_number or not board or not plan or not checksum or not ic_model or not order_quantity or not fileType or not company_id:
             return response.json(444)
 
         area = int(area)
@@ -700,8 +701,11 @@ class DownloadSerialNumberFileView(View):
 
             cs_qs = CompanySerialModel.objects.filter(serial_number__in=sns, status=1).values('serial_number')
             sns = []
-            for cs in cs_qs:
-                sns.append(cs['serial_number'])
+            mark = ""
+            if cs_qs.exists():
+                for cs in cs_qs:
+                    sns.append(cs['serial_number'])
+                mark = cs_qs[0]['company__mark']
 
             sn_qs = SerialNumberModel.objects.filter(serial_number__in=sns)
             count = result['num']
@@ -717,7 +721,7 @@ class DownloadSerialNumberFileView(View):
                     fileTypeName  = 'chenyun'
                     if area == 2:
                         fileTypeName = 'tutk'
-                    return self.download_zip(sn_qs, order , fileTypeName )
+                    return self.download_zip(sn_qs, order , fileTypeName, mark)
                 else:
                     return response.json(444, 'fileType')
             else:
@@ -726,7 +730,7 @@ class DownloadSerialNumberFileView(View):
             return response.json(444, '222')
 
 
-    def download_zip(self, sn_qs, order , fileTypeName):
+    def download_zip(self, sn_qs, order , fileTypeName, mark):
         dir_name = 'static/' + time.strftime('%Y_%m_%d_%H_%M_%S', time.localtime())
         path = '/'.join((BASE_DIR, dir_name)).replace('\\', '/') + '/'
         if not os.path.exists(path):
@@ -749,9 +753,9 @@ class DownloadSerialNumberFileView(View):
             # print(item)
             item = sn_qs[i]
             serial_number = item.serial_number
-            sheet1.write(num, 0, serial_number + '11A')
+            sheet1.write(num, 0, serial_number + mark + item.p2p)
             num += 1
-            content += serial_number.strip() + '11A'
+            content += serial_number.strip() + mark + item.p2p
             content += '\n'
 
             serialNumberModel = SerialNumberModel(

Controller/SerialNumberController.py

@@ -225,7 +225,7 @@ class SerialNumberView(View):
             for us in us_qs:
                 sns.append(us['serial_number__serial_number'])
 
-            cs_qs = CompanySerialModel.objects.filter(serial_number__in=sns, status=1).values('serial_number', 'company__mark')
+            cs_qs = CompanySerialModel.objects.filter(serial_number__in=sns, status=1, company__secret=company_id).values('serial_number', 'company__mark')
             sns = []
             mark = ""
             if cs_qs.exists():
@@ -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, 'mac': mac})
+            return response.json(0, {'serial_number': serial_number + mark + sn_qs[0].p2p, 'mac': mac})
         else:
             return response.json(444)