流程九脚本编写

air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.py

@@ -255,28 +255,83 @@ def get_centeStock_pick_list_counts():
     print('生成拣货单列表查询,result1', result1)
     total1 = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result1))
     return total1
-try:
-    updateUserLoginDefaultRange(get_listUserMgrRangePage(2))  # 设置登录账号默认权限是二级库
-    # 二级库区信息写入文件
-    get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],
-                        FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'], 2)
-    # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
-    # 设置库区联系人
-    set_stockShelf_Linkman()
-    # 低值
-    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
-    # 高值
-    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
-    # 试剂
-    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
-    BuyCarSubmit()  # 请领车提交
-    for i in range(6):  # 三个单据共审批6次
-        approval_center()
-    updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  #设置登录账号默认权限是中心库
-    #获取拣货单列表个数
-    for i in range(get_centeStock_pick_list_counts()):
-        centeStock_pick()#中心库拣货
+def pick_execute(GoodsId):
+    module = "b5_spd3_core_business_flow"
+    # # 登录获取用户id等信息，使用创建的用户登录===========开始
+    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    username = info['username1']
+    password = commonFuc().get_business_data("b2_herp3_bs", "password")
+    print('username,password', username, password)
+    # # 获取token和projectCode
+    token, projectCode, uxid, corpId, info = login(username, password, 2)
+    # 登录获取用户id等信息，使用创建的用户登录============结束
+    # 生成拣货单列表查询===============================================
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            commonFuc().get_business_data(module, "X-APP-CODE"))
+    url1 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+                                                                              "herpService_BuyPick_pickPage_url")
+    print('拣货执行列表页面=================', url1)
+    request_body1 = commonFuc().get_business_data(module, "payload48",GoodsId)
+
+    print('拣货执行列表页面', 'request_body', request_body1)
+    result1 = commonFuc().http_post(url1, request_body1, headers)
+    print('拣货执行列表页面,result1', result1)
+    #获取id
+    PICK_ID=commonFuc().analysis_json('id',commonFuc().analysis_json('data',commonFuc().analysis_json('data',result1)))
+    version=commonFuc().analysis_json('version',commonFuc().analysis_json('data',commonFuc().analysis_json('data',result1)))
+ # 生成拣货单列表查询===============================================
+ # 生成拣货单列表锁定===============================================
+
+    url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+                                                                              "herpService_BuyPick_updateLock_url")
+    print('生成拣货单列表锁定=================', url)
+    # version=int(version)+1
+    request_body = commonFuc().get_business_data(module, "payload49", PICK_ID,version)
+
+    print('生成拣货单列表锁定', 'request_body', request_body)
+    result = commonFuc().http_post(url, request_body, headers)
+    print('生成拣货单列表锁定,result1', result)
+ # 生成拣货单列表锁定===============================================
+ #拣货==============================
+    udi_code=get_udi(1) #获取条码 低值1 高值2 试剂3
+    # url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+    #                                                                          "herpService_BuyPick_updateLock_url")
+    # print('拣货=================', url)
+    # # version=int(version)+1
+    # request_body = commonFuc().get_business_data(module, "payload49", PICK_ID, version)
+    #
+    # print('拣货', 'request_body', request_body)
+    # result = commonFuc().http_post(url, request_body, headers)
+    # print('拣货,result1', result)
 
+ #拣货==============================
+
+try:
+    # updateUserLoginDefaultRange(get_listUserMgrRangePage(2))  # 设置登录账号默认权限是二级库
+    # # 二级库区信息写入文件
+    # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],
+    #                     FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'], 2)
+    # # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
+    # # 设置库区联系人
+    # set_stockShelf_Linkman()
+    # # 低值
+    # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+    # # 高值
+    # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+    # # 试剂
+    # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
+    # BuyCarSubmit()  # 请领车提交
+    # for i in range(6):  # 三个单据共审批6次
+    #     approval_center()
+    # updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  #设置登录账号默认权限是中心库
+    # #获取拣货单列表个数
+    # for i in range(get_centeStock_pick_list_counts()):
+    #     centeStock_pick()#中心库拣货
+    #低值拣货执行
+    hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
+    GoodsId = hosGoodsId.replace(get_hosid(), '')
+    pick_execute(GoodsId)
     commonFuc().check_text_exist_result_text('succees', 'succees')
 except:
     commonFuc().check_text_exist_result_text('error', '1')

air_case/public1/public1/public1.py

@@ -197,9 +197,9 @@ def settle():  # 结算相关
     branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
     hosId = branch_id[0:5]
     provId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"]
-    accountDate1=timeUtils().get_time_hms(5)
-    accountDate2=timeUtils().get_time_hms(5)
-    request_body = commonFuc().get_business_data(module, "payload7", provId, accountDate1,accountDate2,hosId, hosId)
+    accountDate1 = timeUtils().get_time_hms(5)
+    accountDate2 = timeUtils().get_time_hms(5)
+    request_body = commonFuc().get_business_data(module, "payload7", provId, accountDate1, accountDate2, hosId, hosId)
     result = commonFuc().http_post(url, request_body, headers)
     print('result', result)
     data = commonFuc().analysis_json('data', result)
@@ -521,18 +521,19 @@ def get_udi(type=1):
                                             commonFuc().get_business_data(module, "X-APP-CODE"))
 
     # # 请求体
-    if type==1:
+    request_body = 'request_body'
+    if type == 1:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
-        request_body = commonFuc().get_business_data(module, "payload17", GoodsId,get_branch_id())
-    elif type==2:
+        request_body = commonFuc().get_business_data(module, "payload17", GoodsId, get_branch_id())
+    elif type == 2:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
-        request_body = commonFuc().get_business_data(module, "payload17", get_branch_id())
-    elif type==3:
+        request_body = commonFuc().get_business_data(module, "payload17", GoodsId, get_branch_id())
+    elif type == 3:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
-        request_body = commonFuc().get_business_data(module, "payload17", get_branch_id())
+        request_body = commonFuc().get_business_data(module, "payload17", GoodsId, get_branch_id())
 
     print('request_body', request_body)
 
@@ -569,7 +570,7 @@ def get_udi(type=1):
     titlename = ('list_a', 'list_b', 'list_c')
     # 将条码信息写入文件
     FileUtils().w_info8(info, module, '条码信息', titlename, 'message18')
-
+    return pkgcode
 
 def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
     # # 登录获取用户id等信息，使用创建的用户登录===========开始
@@ -717,10 +718,10 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
     invoiceQty = leftSettleQty
     invoiceAmount = maxSettleAmount
     invoiceDate = timeUtils().get_time_hms(5)
-    invoiceCode=OBh_ID+str(timeUtils().get_time_hms(5))
-    invoiceNumber=OBh_ID+str(timeUtils().get_time_hms(5))
+    invoiceCode = OBh_ID + str(timeUtils().get_time_hms(5))
+    invoiceNumber = OBh_ID + str(timeUtils().get_time_hms(5))
     request_body = commonFuc().get_business_data(module, "payload3_2_2_2", hosName, invoiceQty, invoiceAmount,
-                                                 invoiceNumber,invoiceCode,invoiceDate, get_hosid(), hosVersion)
+                                                 invoiceNumber, invoiceCode, invoiceDate, get_hosid(), hosVersion)
     print('发票缓存提交request_body', request_body)
     # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
@@ -745,10 +746,11 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
                                          commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
     sumAmount = commonFuc().analysis_json('sumAmount',
                                           commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
-    settleMonth= commonFuc().analysis_json('settleMonth',
-                                          commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
-    provId= commonFuc().analysis_json('provId',
-                                          commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+    settleMonth = commonFuc().analysis_json('settleMonth',
+                                            commonFuc().analysis_json('data',
+                                                                      commonFuc().analysis_json('data', result)))
+    provId = commonFuc().analysis_json('provId',
+                                       commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
 
     # ===============预开票列表查询====================================
     # ===============预开票提交====================================
@@ -832,9 +834,9 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
     data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
     for i in data1:
         id = commonFuc().analysis_json('id', i)
-        if id==id1:
+        if id == id1:
             break
-    VI_id=id1
+    VI_id = id1
     print('id1', id1)
     # ==============发票列表查询
     # ==============发票核对提交
@@ -859,7 +861,7 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
     print('result', '内网发票提交列表查询结果', result)
     data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
     total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
-    VI_id2='VI_id2'
+    VI_id2 = 'VI_id2'
     if total == 0:
         print('检查被测程序，发票提交列表查询数据是否正确')
     else:
@@ -888,7 +890,7 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
     print('result', '发票归档列表查询', result)
     data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
     total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
-    VI_id3='VI_id3'
+    VI_id3 = 'VI_id3'
     if total == 0:
         print('检查被测程序，发票归档列表查询查询数据是否正确')
     else:
@@ -917,7 +919,7 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
     print('result', '付款单列表查询', result)
     data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
     total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
-    VI_id4='VI_id4'
+    VI_id4 = 'VI_id4'
     if total == 0:
         print('检查被测程序，发票归档列表查询查询数据是否正确')
     else:
@@ -1629,13 +1631,13 @@ def height_value_order_dp(orderno):  # 高值跟台配送
     # 从message9文件中获取信息1
     info = FileUtils().r_info8('b5_spd3_core_business_flow', "配送订单详细信息", 'message9')
     list_a = info['list_a']
-    sumAmount = commonFuc().analysis_json('sumAmount',list_a)
-    statusText = commonFuc().analysis_json('statusText',list_a)
-    sumQty = str(commonFuc().analysis_json('sumQty',list_a))
-    operationPkg=commonFuc().analysis_json('operationPkg',list_a)
-    provName=commonFuc().analysis_json('provName',list_a)
-    status = str(commonFuc().analysis_json('status',list_a))
-    version= str(commonFuc().analysis_json('version',list_a))
+    sumAmount = commonFuc().analysis_json('sumAmount', list_a)
+    statusText = commonFuc().analysis_json('statusText', list_a)
+    sumQty = str(commonFuc().analysis_json('sumQty', list_a))
+    operationPkg = commonFuc().analysis_json('operationPkg', list_a)
+    provName = commonFuc().analysis_json('provName', list_a)
+    status = str(commonFuc().analysis_json('status', list_a))
+    version = str(commonFuc().analysis_json('version', list_a))
     # 从message9文件中获取信息1==============
     # 从message9文件中获取信息2============
     info = FileUtils().r_info8('b5_spd3_core_business_flow', "配送订单详细信息2", 'message9')
@@ -1651,22 +1653,22 @@ def height_value_order_dp(orderno):  # 高值跟台配送
             print('bbbbbbbbbbbbbbbbbbb', j)
             hosGoodsId = j['hosGoodsId']
             id3 = j['id']
-            goodsNum=j['goodsNum']
-            price=j['price']
-            inSettlement=j['inSettlement']
-            inSettlementText=j['inSettlementText']
-            goodsName=j['goodsName']
-            goodsSpec=j['goodsSpec']
-            goodsMfrsId=j['goodsMfrsId']
-            goodsMfrsName=j['goodsMfrsName']
-            unit=j['unit']
-            subProvId=j['subProvId']
-            subProvName=j['subProvName']
-            totalAmount=j['totalAmount']
-            spdGoodsCode=j['spdGoodsCode']
-            barCodeMng=j['barCodeMng']
-            settlement=j['inSettlement']
-            goodsCode=j['goodsCode']
+            goodsNum = j['goodsNum']
+            price = j['price']
+            inSettlement = j['inSettlement']
+            inSettlementText = j['inSettlementText']
+            goodsName = j['goodsName']
+            goodsSpec = j['goodsSpec']
+            goodsMfrsId = j['goodsMfrsId']
+            goodsMfrsName = j['goodsMfrsName']
+            unit = j['unit']
+            subProvId = j['subProvId']
+            subProvName = j['subProvName']
+            totalAmount = j['totalAmount']
+            spdGoodsCode = j['spdGoodsCode']
+            barCodeMng = j['barCodeMng']
+            settlement = j['inSettlement']
+            goodsCode = j['goodsCode']
             break
         # # #获取日期
     productDate = timeUtils().get_time_hms(5)
@@ -1674,17 +1676,18 @@ def height_value_order_dp(orderno):  # 高值跟台配送
     createUser = uxid
     lastModifiedUser = uxid
     viewId = id3
-    createUserName=provName
-    priceTotal=price
+    createUserName = provName
+    priceTotal = price
     request_body = commonFuc().get_business_data(module, "payload27", id1, orderno, sourceOrderNo, hosId, hosName,
-                                                 branchName, recDeptName,operName, operDate, operDoctor, patientName,
-                                                 status, statusText, version,patientInHosId, remark, createUserName,
+                                                 branchName, recDeptName, operName, operDate, operDoctor, patientName,
+                                                 status, statusText, version, patientInHosId, remark, createUserName,
                                                  distPriority, hosVersion, createTime, sumQty, sumAmount, operationPkg,
                                                  provId, provName, recDeptId, createUser, lastModifiedUser,
                                                  id3, hosGoodsId, goodsNum, price, inSettlement, inSettlementText,
                                                  goodsName, goodsSpec, goodsCode, goodsMfrsId, goodsMfrsName, unit,
                                                  subProvId, subProvName, totalAmount, spdGoodsCode, barCodeMng,
-                                                 sumAmount, id3, hosGoodsId, goodsCode, settlement, productDate,expdtDate, viewId)
+                                                 sumAmount, id3, hosGoodsId, goodsCode, settlement, productDate,
+                                                 expdtDate, viewId)
 
     print('高值跟台订单配送request_body', request_body)
     # 发送请求
@@ -1745,7 +1748,8 @@ def Search_OrderNO():
     data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
     return commonFuc().analysis_json('orderNo', data1)
 
-#高值跟台验收管理
+
+# 高值跟台验收管理
 def check_accept_order():
     # # 登录获取用户id等信息，使用创建的用户登录===========开始
     info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
@@ -1881,7 +1885,7 @@ def check_accept_order():
     sourceBillId = sourceId
     request_body = commonFuc().get_business_data(module, "payload2", sourceBillId, viewId)
 
-    print('设置验收全部合格request_body',request_body)
+    print('设置验收全部合格request_body', request_body)
     # 发送请求
     time.sleep(6)
 
@@ -1889,9 +1893,9 @@ def check_accept_order():
         result = commonFuc().http_post(url, request_body, headers)
         print('result', result)
         data = commonFuc().analysis_json('data', result)
-        code= commonFuc().analysis_json('code', result)
+        code = commonFuc().analysis_json('code', result)
         print(code)
-        if code ==0 and data==1:
+        if code == 0 and data == 1:
             break
         else:
             print('设置产品合格出现问题')
@@ -1928,6 +1932,7 @@ def check_accept_order():
     titlename = ('CHECK_NO1', 'CHECK_NO2')
     FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单号', titlename, 'message15')
 
+
 # 根据左右边界提取文本，返回匹配到的文本
 def reGetString(String, leftBinary="^", rightBinary="$"):
     import re
@@ -1937,6 +1942,7 @@ def reGetString(String, leftBinary="^", rightBinary="$"):
     except:
         return "没有匹配到内容，请检查左右边界"
 
+
 def set_stockShelf_Linkman():
     print('设置库区联系人')
     # # 登录获取用户id等信息，使用创建的用户登录===========开始
@@ -1962,24 +1968,23 @@ def set_stockShelf_Linkman():
     recPhone = commonFuc().analysis_json('recPhone', list_a)
     lastModified = commonFuc().analysis_json('lastModified', list_a)
     shelfNo = commonFuc().analysis_json('shelfNo', list_a)
-    version= commonFuc().analysis_json('version', list_a)
-    createUser= uxid
+    version = commonFuc().analysis_json('version', list_a)
+    createUser = uxid
 
-    module='b2_herp3_bs'
+    module = 'b2_herp3_bs'
 
-    url = commonFuc().get_api_add_port_url()+ commonFuc().get_business_data(module, "basic_stockShelf_updateById_url")
+    url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_stockShelf_updateById_url")
 
     # # 获取请求头信息
     headers = commonFuc().get_business_data(module, "json_headers2",
                                             commonFuc().get_business_data(module, "json_contentType"), token,
                                             commonFuc().get_business_data(module, "X-APP-CODE"))
 
-
-
-    request_body = commonFuc().get_business_data(module, "payload62_7_1_1", id1, lastModified, version, createTime, createUser,createUser,stockId,
-                                                 shelfCode, shelfName, address, createUser,recPhone, shelfNo)
+    request_body = commonFuc().get_business_data(module, "payload62_7_1_1", id1, lastModified, version, createTime,
+                                                 createUser, createUser, stockId,
+                                                 shelfCode, shelfName, address, createUser, recPhone, shelfNo)
     print('request_body', request_body)
 
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
-    print('resultbbbbbbbbbbb', result)
+    print('resultbbbbbbbbbbb', result)
\ No newline at end of file

data/b5_spd3_core_business_flow/data

@@ -47,6 +47,8 @@
 "herpService_approvalBatch_url": "/api/herpService/apprCenter/approvalBatch"
 "herpService_BuyPick_buyPage_url": "/api/herpService/BuyPick/buyPage"
 "herpService_BuyPick_savePick_url": "/api/herpService/BuyPick/savePick"
+"herpService_BuyPick_pickPage_url": "/api/herpService/BuyPick/pickPage"
+"herpService_BuyPick_updateLock_url": "/api/herpService/BuyPick/updateLock"
 
 
 "username": "xhs1009"
@@ -113,4 +115,6 @@ json_headers2: {
 "payload44": {"billExpdtDate":"%s","billExpectDate":"","priority":"0","remark":"","branchId":"%s","buyCarIds":["%s","%s","%s"]}
 "payload45": {"dtos":"%s","opinion":1}
 "payload46": {"pageNum":1,"pageSize":50,"queryObject":{"deptId":"","auditStartTime":null,"auditEndTime":null,"startBillExpectDate":null,"endBillExpectDate":null,"priorityList":[],"orderNo":"","keyword":"","goodsSpec":"","shelfName":"","address":""}}
-"payload47": {"generateAll":false,"ids":["%s"]}
+"payload47": {"generateAll":false,"ids":["%s"]}
\ No newline at end of file
+"payload48": {"pageNum":1,"pageSize":50,"queryObject":{"pickType":"KS","id":"","pickerName":"","targetDeptName":"","priorityList":[],"areaCode":"","keyword":"%s","goodsSpec":""}}
+"payload49": {"lockStatus":1,"pickId":"%s","version":"%s"}
\ No newline at end of file

report/summary.html

@@ -56,7 +56,7 @@
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1分14秒</td>
+            <td class='details-col-elapsed'>0分5秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -72,9 +72,9 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a_a9流程六_中心库入库结算_负结算/log.html' target='_blank'>a_a9流程六_中心库入库结算_负结算</a></td>
+            <td class="details-col-elapsed"><a href='../log/a_b2流程九请领业务流_二级库向中心库/log.html' target='_blank'>a_b2流程九请领业务流_二级库向中心库</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">74.749</td>
+            <td class="details-col-elapsed">5.011</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>