Forráskód Böngészése

APP扫码排查序列号重复接口增加分类选项

zhangdongming 1 éve
szülő
commit
2359c1fbc5
1 módosított fájl, 18 hozzáadás és 1 törlés
  1. 18 1
      Controller/UserDevice/SerialNumberCheckController.py

+ 18 - 1
Controller/UserDevice/SerialNumberCheckController.py

@@ -61,9 +61,26 @@ class SerialNumberView(View):
         p_type = int(request_dict.get('type', 0))
         n_time = int(time.time())
         try:
+            dict_type = {'1': '三乡总装', '2': '三乡包装', '3': '三乡返工', '4': '三乡管理', '5': '珠海包装', '6': '珠海管理'}
             first_serial = serial_no[:6]
             # 查询当前工位是否扫过序列号
-            first_serial_qs = SerialNumberCheckLog.objects.filter(serial_number=first_serial, type=p_type)
+            first_serial_qs = SerialNumberCheckLog.objects.filter(serial_number=first_serial)
+            # 工位类型,1:三乡总装,2:三乡包装,3:三乡返工,4:三乡管理,5:珠海包装
+            if p_type == 4 or p_type == 6:
+                first_serial_qs = first_serial_qs.filter(type=5) if p_type == 6 else first_serial_qs.exclude(type=5)
+                first_serial_qs = first_serial_qs.order_by('type', '-created_time')
+                if not first_serial_qs.exists():
+                    return response.json(173)
+                logs = []
+                # 管理分类可查询当前序列号扫码记录
+                for item in first_serial_qs:
+                    log_dict = {'fullSerialNumber': item.full_serial_number, 'count': item.count, 'type': item.type,
+                                'createdTime': item.created_time, 'stationName': dict_type[str(item.type)],
+                                'phoneModel': item.phone_model}
+                    logs.append(log_dict)
+                result = {'logs': logs}
+                return response.json(0, result)
+            first_serial_qs.filter(type=p_type)
             if first_serial_qs.exists():
                 result = {
                     "serialNumber": serial_no,