241217-2代码。

routers/api/resourceProvison/MaterialReserveManagement/dispatch.py

@@ -42,7 +42,9 @@ async def create_pattern(
             create_by = user_id
         )
         db.add(new_dispatch)
+        serial_number=0
         for info in body['detail']:
+            serial_number+=1
             material_into = material_id_get_material_info(db, info['material_code'])
             if material_into:
                 material_name = material_into.material_name
@@ -61,7 +63,7 @@ async def create_pattern(
 
             new_detail = ResourceProvisionDispatchDetail(
                 id=new_guid(),
-                serial_number=info['serial_number'],
+                serial_number=serial_number,
                 dispatch_id = new_dispatch.id,
                 warehouse_id = warehouse_id,
                 material_type_id = material_type_id,
@@ -98,7 +100,9 @@ async def update_dispatch(
         update_dispatch.update_by = user_id
 
         detail_list = []
+        serial_number=0
         for info in body['detail']:
+            serial_number+=1
             material_into = material_id_get_material_info(db, info['material_code'])
             if material_into:
                 material_name = material_into.material_name
@@ -117,7 +121,7 @@ async def update_dispatch(
             if info['id']=='':
                 new_detail = ResourceProvisionDispatchDetail(
                     id=new_guid(),
-                    serial_number=info['serial_number'],
+                    serial_number=serial_number,
                     dispatch_id=update_dispatch.id,
                     warehouse_id=warehouse_id,
                     material_type_id=material_type_id,
@@ -135,7 +139,7 @@ async def update_dispatch(
                 if detail is None:
                     new_detail = ResourceProvisionDispatchDetail(
                         id=new_guid(),
-                        serial_number=info['serial_number'],
+                        serial_number=serial_number,
                         dispatch_id=update_dispatch.id,
                         warehouse_id=warehouse_id,
                         material_type_id=material_type_id,
@@ -149,7 +153,7 @@ async def update_dispatch(
                     db.add(new_detail)
                     detail_list.append(new_detail.id)
                 else:
-                    detail.serial_number = info['serial_number']
+                    detail.serial_number = serial_number
                     detail.warehouse_id = warehouse_id
                     detail.material_type_id = material_type_id
                     detail.material_type = material_category_name

routers/api/resourceProvison/MaterialReserveManagement/procurement.py

@@ -41,11 +41,13 @@ async def create_pattern(
             create_by = user_id
         )
         db.add(new_declaration)
+        serial_number=0
         for info in body['detail']:
             material_info = material_id_get_material_info(db,info['material_code'])
+            serial_number+=1
             new_detail = ResourceProvisionProcurementDeclarationDetail(
                 id=new_guid(),
-                serial_number=info['serial_number'],
+                serial_number=serial_number,
                 declaration_id = new_declaration.id,
                 warehouse_id = material_info.warehouse_id,
                 material_type = material_info.material_type,
@@ -81,12 +83,14 @@ async def update_pattern(
         update_declaration.update_by = user_id
 
         detail_list = []
+        serial_number=0
         for info in body['detail']:
             material_info = material_id_get_material_info(db, info['material_code'])
+            serial_number+=1
             if info['id']=='':
                 new_detail = ResourceProvisionProcurementDeclarationDetail(
                     id=new_guid(),
-                    serial_number=info['serial_number'],
+                    serial_number=serial_number,
                     declaration_id=update_declaration.id,
                     warehouse_id = material_info.warehouse_id,
                     material_type=material_info.material_type,
@@ -103,7 +107,7 @@ async def update_pattern(
                 if detail is None:
                     new_detail = ResourceProvisionProcurementDeclarationDetail(
                         id=new_guid(),
-                        serial_number=info['serial_number'],
+                        serial_number=serial_number,
                         declaration_id=update_declaration.id,
                         warehouse_id = material_info.warehouse_id,
                         material_type=material_info.material_type,
@@ -116,7 +120,7 @@ async def update_pattern(
                     db.add(new_detail)
                     detail_list.append(new_detail.id)
                 else:
-                    detail.serial_number = info['serial_number']
+                    detail.serial_number = serial_number
                     detail.warehouse_id = material_info.warehouse_id
                     detail.material_type = material_info.material_type
                     detail.material_code = info['material_code']