diff --git "a/air_case/b5_spd3_core_business_flow/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.air/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.py" "b/air_case/b5_spd3_core_business_flow/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.air/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.py"
index 83d5b06a0dd0be6ccba1d851390c602a950c08cc..f85e9bea82423cfb0c31df4f8cdfa7602efb3c45 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.air/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.air/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.py"
@@ -199,7 +199,7 @@ def check_accept_order(type=1):
sourceType, tbStatus, createUser, sourceNo, viewId, viewId, settlement,
recTemperature, recHumidity)
- print('request_body', 'c', request_body)
+ print('request_body', '提交验收单', request_body)
# 发送请求
while True:
time.sleep(3)
diff --git "a/air_case/b5_spd3_core_business_flow/a_a8\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\244\226\347\275\221\345\274\200\347\245\250.air/a_a8\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\244\226\347\275\221\345\274\200\347\245\250.py" "b/air_case/b5_spd3_core_business_flow/a_a8\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\244\226\347\275\221\345\274\200\347\245\250.air/a_a8\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\244\226\347\275\221\345\274\200\347\245\250.py"
index 184e4849529b6db6427b956f2d5aef5695345ed6..495639249abb7753dfc69716babc7ed1299ac37a 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a8\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\244\226\347\275\221\345\274\200\347\245\250.air/a_a8\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\244\226\347\275\221\345\274\200\347\245\250.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a8\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\244\226\347\275\221\345\274\200\347\245\250.air/a_a8\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\244\226\347\275\221\345\274\200\347\245\250.py"
@@ -171,7 +171,7 @@ def invoice():
invoiceDate = timeUtils().get_time_hms(5)
request_body = commonFuc().get_business_data(module, "payload3_2_2_2", hosName, invoiceQty, invoiceAmount,
invoiceDate, hosId, hosVersion)
- print('request_body', request_body)
+ print('发票缓存提交request_body', request_body)
# 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('发票缓存提交result', result)
@@ -388,7 +388,8 @@ try:
OBH_ID = settle()
# 调用审批结算单
approval_center(OBH_ID)
- invoice()
+ from air_case.public1.public1.public1 import *
+ invoice(2,OBH_ID)
except Exception as e:
print('脚本出现异常，请检查脚本或者数据')
print("发生异常：", str(e))
diff --git "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py"
index 36457b9caec2f0ecf0a3c0338046430b2eac6222..129f11f44a9d757bbc28f5f87f0122aec5802864 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py"
@@ -255,7 +255,7 @@ def get_centeStock_pick_list_counts():
print('生成拣货单列表查询,result1', result1)
total1 = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result1))
return total1
-def pick_execute(GoodsId):
+def pick_execute(GoodsId,type=1):
module = "b5_spd3_core_business_flow"
# # 登录获取用户id等信息，使用创建的用户登录===========开始
info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
@@ -294,46 +294,126 @@ def pick_execute(GoodsId):
print('生成拣货单列表锁定,result1', result)
# 生成拣货单列表锁定===============================================
#拣货==============================
- udi_code=get_udi1(1) #获取条码 低值1 高值2 试剂3
+ if type==1:
+ udi_code=get_udi1(1) #获取条码 低值1 高值2 试剂3
+ elif type==2:
+ udi_code = get_udi1(2) # 获取条码 低值1 高值2 试剂3
+ elif type==3:
+ udi_code = get_udi1(3) # 获取条码 低值1 高值2 试剂3
print('udi_code',udi_code)
- pickScan(PICK_ID,udi_code)
- # 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)
+ pickScan(PICK_ID,udi_code,type)
+ #提交拣货执行单
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_BuyPick_updateStatus_url")
+ url=url+PICK_ID
+ print('提交拣货执行单=================', url)
+ request_body = commonFuc().get_business_data(module, "payload51",PICK_ID)
+ print('提交拣货执行单', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('提交拣货执行单,result1', result)
- #拣货==============================
+ #拣货===================================
+ #复核===================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_hdiBarcode_scan_url")
+ url = url + udi_code
+ print('复核=================', url)
+ result = commonFuc().http_get(url, headers)
+ print('复核,result1', result)
+ result = commonFuc().http_get(url, headers)
+ print('扫码复核result', result)
+ data = commonFuc().analysis_json('data', result)
+ UT_id = commonFuc().analysis_json('id', data)
+ createTime = commonFuc().analysis_json('createTime', data)
+ snCode = commonFuc().analysis_json('snCode', data)
+ tagType = commonFuc().analysis_json('tagType', data)
+ goodsDi = commonFuc().analysis_json('goodsDi', data)
+ hosId= commonFuc().analysis_json('hosId', data)
+ stockId= commonFuc().analysis_json('stockId', data)
+ areaCode= commonFuc().analysis_json('areaCode', data)
+ areaName= commonFuc().analysis_json('areaName', data)
+ shelfCode= commonFuc().analysis_json('shelfCode', data)
+ codeType= commonFuc().analysis_json('codeType', data)
+ mdmGoodsCode= commonFuc().analysis_json('mdmGoodsCode', data)
+ goodsCode= commonFuc().analysis_json('goodsCode', data)
+ barName= commonFuc().analysis_json('barName', data)
+ batchCode= commonFuc().analysis_json('batchCode', data)
+ expdtDate= commonFuc().analysis_json('expdtDate', data)
+ productDate= commonFuc().analysis_json('productDate', data)
+ pkgCode= commonFuc().analysis_json('pkgCode', data)
+ pkgCodeSee= commonFuc().analysis_json('pkgCodeSee', data)
+ ssccCode= commonFuc().analysis_json('ssccCode', data)
+ tbStatus= commonFuc().analysis_json('tbStatus', data)
+ purMode= commonFuc().analysis_json('purMode', data)
+ goodsMfrsName= commonFuc().analysis_json('goodsMfrsName', data)
+ goodsSpec= commonFuc().analysis_json('goodsSpec', data)
+ unit= commonFuc().analysis_json('unit', data)
+ goodsName= commonFuc().analysis_json('goodsName', data)
+ made= commonFuc().analysis_json('made', data)
+ hosGoodsCode= commonFuc().analysis_json('hosGoodsCode', data)
+ distrBillId = commonFuc().analysis_json('distrBillId', commonFuc().analysis_json('ext', data))
+ purBillId = commonFuc().analysis_json('purBillId', commonFuc().analysis_json('ext', data))
+ distrDetailId = commonFuc().analysis_json('distrDetailId', commonFuc().analysis_json('ext', data))
+ pkgDefId = commonFuc().analysis_json('pkgDefId', commonFuc().analysis_json('ext', data))
+ pkgDefQty = commonFuc().analysis_json('pkgDefQty', commonFuc().analysis_json('ext', data))
+ pkgDefName =commonFuc().analysis_json('pkgDefName', commonFuc().analysis_json('ext', data))
+ print(UT_id)
+ # ========================扫码复核
+ # ========出库复核提交==========
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_stock_review_pass_submit_url")
+ print('url', url)
+ # sourceId = ' '.join(PICK_ID)
+ sourceId = PICK_ID
+ # 请求体
+ request_body = commonFuc().get_business_data(module, "payload52", UT_id, createTime, snCode, hosId, stockId,
+ areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
+ mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
+ productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, distrDetailId,
+ distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
+ goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
+ pkgDefName, made, hosGoodsCode, sourceId)
+ print('request_body', request_body)
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('herpService_stock_review_pass_submit_urlresult', 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()#中心库拣货
+ 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)
+ pick_execute(GoodsId,1)
+ # 高值拣货执行
+ hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ pick_execute(GoodsId,2)
+ # 试剂拣货执行
+ hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ pick_execute(GoodsId, 3)
+ second_dept_one_key_in()
+ second_dept_one_key_in()
+ second_dept_one_key_in()
commonFuc().check_text_exist_result_text('succees', 'succees')
except:
commonFuc().check_text_exist_result_text('error', '1')
diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py
index e0a7590d58f4fa6bb425d0728ad8607f6d2a31f7..0e45f4426b236202cbed985607de65ccb86c64e6 100644
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -540,26 +540,58 @@ def get_udi1(type=1):#库存明细查询获取条码
result = commonFuc().http_post(url, request_body, headers)
data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
- pkgcode = data1[0]['pkgCodeSee']
- pkgcode1 = pkgcode[0:20]
- pkgcode2 = pkgcode[21:len(pkgcode)]
- print(pkgcode1, pkgcode2)
+ # pkgcode = data1['pkgCodeSee']
+ # pkgcode1 = pkgcode[0:20]
+ # pkgcode2 = pkgcode[21:len(pkgcode)]
+ # print(pkgcode1, pkgcode2)
# 013530000003170010333\x1D112404261724110221UT240426000001802
- print('aaaaaaaaaaaaaaaaa', data1[0]['pkgCodeSee'])
- # # 将条码信息写入文件
+ # print('aaaaaaaaaaaaaaaaa', data1[0]['pkgCodeSee'])
+ # pkgcode='pkgcode'
+ print('条码库存result',result)
- list_a = []
- list_b = []
- list_c = []
- list_a.append(data1)
- list_b.append(data1)
- list_c.append(data1)
- # print('list_a', len(list_a), list_a)
- info = (list_a, list_b, list_c)
- titlename = ('list_a', 'list_b', 'list_c')
- # 将条码信息写入文件
- FileUtils().w_info8(info, module, '条码信息', titlename, 'message18')
- return pkgcode
+ for i in data1:
+ lockStatus = commonFuc().analysis_json('lockStatus',i)
+ if lockStatus == 0:
+ print('lockStatus', lockStatus)
+ pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', i)
+ pkgcode = commonFuc().analysis_json('pkgCodeSee', i)
+ # # 将条码信息写入文件
+ list_a = []
+ list_b = []
+ list_c = []
+ list_a.append(i)
+ list_b.append(i)
+ list_c.append(i)
+ # print('list_a', len(list_a), list_a)
+ info = (list_a, list_b, list_c)
+ titlename = ('list_a', 'list_b', 'list_c')
+ # 将条码信息写入文件
+ FileUtils().w_info8(info, module, '条码信息', titlename, 'message18')
+ break
+ return pkgCodeSee
+ # for i in data1:
+ # lockStatus = commonFuc().analysis_json('lockStatus', i)
+ # if lockStatus == 0:
+ # print('lockStatus',lockStatus)
+ # pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', i)
+ # pkgcode = commonFuc().analysis_json('pkgCodeSee', i)
+ # # # 将条码信息写入文件
+ # list_a = []
+ # list_b = []
+ # list_c = []
+ # list_a.append(i)
+ # list_b.append(i)
+ # list_c.append(i)
+ # # print('list_a', len(list_a), list_a)
+ # info = (list_a, list_b, list_c)
+ # titlename = ('list_a', 'list_b', 'list_c')
+ # # 将条码信息写入文件
+ # FileUtils().w_info8(info, module, '条码信息', titlename, 'message18')
+ # break
+ # elif lockStatus == 1:
+ # continue
+ # print('pkgcode',pkgcode)
+ # return pkgcode
def get_udi(type=1):#退货出库扫条码
# type=1低值 2高值 3试剂
module = "b5_spd3_core_business_flow"
@@ -885,14 +917,14 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
break
else:
continue
- if total == 0:
- print('数据暂时未同步过来')
- i = i + 1
- if i >= 100:
- print('600秒过去了，数据还未查询出来，检查一下脚本或者被测软件')
- continue
- else:
- break
+ # if total == 0:
+ # print('数据暂时未同步过来')
+ # i = i + 1
+ # if i >= 100:
+ # print('600秒过去了，数据还未查询出来，检查一下脚本或者被测软件')
+ # continue
+ # else:
+ # break
except:
continue
@@ -2075,7 +2107,7 @@ def set_stockShelf_Linkman():
result = commonFuc().http_post(url, request_body, headers)
print('resultbbbbbbbbbbb', result)
-def pickScan(PICK_ID,udi_code):#拣货扫码
+def pickScan(PICK_ID,udi_code,type=1):#拣货扫码
module = "b5_spd3_core_business_flow"
# # 登录获取用户id等信息，使用创建的用户登录===========开始
info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
@@ -2130,7 +2162,7 @@ def pickScan(PICK_ID,udi_code):#拣货扫码
unit=commonFuc().analysis_json('unit',data1)
goodsName=commonFuc().analysis_json('goodsName',data1)
pkgDefId=commonFuc().analysis_json('pkgDefId',data1)
- pkgDefQty=commonFuc().analysis_json('pkgDefQty',data1)
+ # pkgDefQty=commonFuc().analysis_json('pkgDefQty',data1)
pkgDefName=commonFuc().analysis_json('pkgDefName',data1)
printNum=commonFuc().analysis_json('printNum',data1)
made=commonFuc().analysis_json('made',data1)
@@ -2146,20 +2178,288 @@ def pickScan(PICK_ID,udi_code):#拣货扫码
stockName=get_branch_name()
createTime=timeUtils().get_time_hms(1)
# # 请求体
- request_body = commonFuc().get_business_data(module, "payload50", areaCode, UTid, createTime, UTid, get_hosid(), stockId,
+ if type==1:
+ request_body = commonFuc().get_business_data(module, "payload50", areaCode, UTid, createTime, UTid, get_hosid(), stockId,
+ areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
+ mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
+ productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, distrDetailId,
+ distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
+ goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
+ pkgDefName, printNum, made,
+ hosGoodsCode, PICK_ID,areaName,stockName)
+ elif type==2:
+ request_body = commonFuc().get_business_data(module, "payload50_2", areaCode, UTid, createTime, UTid, get_hosid(),
+ stockId,
+ areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
+ mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
+ productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
+ distrDetailId,
+ distrBillId, purBillId, pkgDefQty, purMode,
+ goodsMfrsName, goodsSpec, unit, goodsName,
+ printNum, made,
+ hosGoodsCode, PICK_ID, areaName, stockName)
+ elif type==3:
+ request_body = commonFuc().get_business_data(module, "payload50", areaCode, UTid, createTime, UTid,
+ get_hosid(), stockId,
+ areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
+ mdmGoodsCode, goodsCode, goodsDi, barName, batchCode,
+ expdtDate,
+ productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
+ distrDetailId,
+ distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName,
+ purMode,
+ goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
+ pkgDefName, printNum, made,
+ hosGoodsCode, PICK_ID, areaName, stockName)
+ print('request_body', '拣货扫码', request_body)
+
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ PICK_ID = commonFuc().analysis_json('data', result)
+
+def get_branch_name():
+ return FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_name"]
+
+def out_warehouse_review(PICK_ID):#出库复核
+ 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等信息，使用创建的用户登录============结束
+
+ # url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_pick_submit_url")
+ # print('url', 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"))
+ #从文件中获取必要信息
+ info = FileUtils().r_info8(module, "条码信息", 'message18')
+ # print('info', info)
+ list_a = info['list_a']
+ print('list_a', list_a[0], type(list_a), len(list_a))
+ UTid = 'UT'
+ areaCode = 'areaCode';
+ createTime = 'createTime';
+ hosId = 'hosId';
+ stockId = 'stockId';
+ areaCode = 'areaCode';
+ areaName = 'areaName';
+ shelfCode = 'shelfCode'
+ codeType = 'codeType';
+ # tagType = 'tagType';
+ hosGoodsId = 'hosGoodsId';
+ mdmGoodsCode = 'mdmGoodsCode';
+ goodsCode = 'goodsCode';
+ # goodsDi = 'goodsDi';
+ barName = 'barName';
+ batchCode = 'batchCode'
+ expdtDate = 'expdtDate';
+ productDate = 'productDate'
+ pkgCode = 'pkgCode'
+ print('aaaaaaaaaaaaaaaaaaaaaaaaa', list_a[0])
+ list_b = list_a[0]
+ for i in list_b:
+ print(i)
+ UTid = i['id']
+ areaCode = i['areaCode']
+ # createTime = i['createTime']
+ # hosId = i['hosId']
+ stockId = i['stockId'];
+ areaCode = i['areaCode'];
+ areaName = i['areaName'];
+ shelfCode = i['shelfCode']
+ codeType = i['codeType'];
+ # tagType = i['tagType'];
+ hosGoodsId = i['hosGoodsId'];
+ # mdmGoodsCode = i['mdmGoodsCode']
+ goodsCode = i['goodsCode'];
+ # goodsDi = i['goodsDi'];
+ barName = i['barName'];
+ batchCode = i['batchCode']
+ expdtDate = i['expdtDate'];
+ productDate = i['productDate']
+ # pkgCode = i['pkgCode']
+ pkgCodeSee = i['pkgCodeSee']
+ ssccCode = i['ssccCode']
+ # tbStatus = i['tbStatus']
+ onlyKey = i['hosGoodsId']
+ # ext = i['extInfo']
+ # print('ext', ext)
+ # distrDetailId = ext['distrDetailId']
+ # distrBillId = ext['distrBillId']
+ # purBillId = ext['purBillId']
+ # pkgDefQty = ext['pkgDefQty']
+ # pkgDefId = ext['pkgDefId']
+ # pkgDefName = ext['pkgDefName']
+ purMode = i['purMode']
+ goodsMfrsName = i['goodsMfrsName']
+ goodsSpec = i['goodsSpec']
+ unit = i['unit']
+ goodsName = i['goodsName']
+ pkgDefId = i['pkgDefId']
+ pkgDefQty = i['pkgDefQty']
+ pkgDefName = i['pkgDefName']
+ # printNum = i['printNum']
+ made = i['made']
+ provId = i['provId']
+ provName = i['provName']
+ # subProvId = i['subProvId']
+ # subProvName = i['subProvName']
+ hosGoodsCode = i['hosGoodsCode']
+ # subSendFlag = i['subSendFlag']
+ areaName = i['areaName']
+ # hosId = i['hosId']
+ break
+ deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
+ deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid1"]
+ # # # 请求体
+ # request_body = commonFuc().get_business_data(module, "payload19", areaCode, UTid, createTime, UTid, hosId, stockId,
+ # areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
+ # mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
+ # productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, distrDetailId,
+ # distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
+ # goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
+ # pkgDefName, printNum, made, provId, provName, subProvId, subProvName,
+ # hosGoodsCode, subSendFlag, onlyKey, areaName, hosId, get_branch_id(),
+ # deptid1, deptName, stockId)
+ # print('request_body', 'ccccccc', request_body)
+ #
+ # # # # # 发送请求
+ # result = commonFuc().http_post(url, request_body, headers)
+ # print('result', result)
+ # PICK_ID = commonFuc().analysis_json('data', result)
+ # =====================出库复核列表查询获取pickid===============
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_pick_return_page_url")
+ print('url', url)
+ request_body = commonFuc().get_business_data(module, "payload20", get_branch_id(), get_hosid(), deptid1)
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+
+ # =====================出库复核列表查询获取pickid===============
+
+ # ========================扫码复核
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_stock_hdiBarcode_scan_url")
+ url = url + pkgCodeSee
+ print('扫码复核url', url)
+ # # # # 发送请求
+ result = commonFuc().http_get(url, headers)
+ print('扫码复核result', result)
+ data = commonFuc().analysis_json('data', result)
+ UT_id = commonFuc().analysis_json('id', data)
+ createTime = commonFuc().analysis_json('createTime', data)
+ snCode = commonFuc().analysis_json('snCode', data)
+ tbStatus=commonFuc().analysis_json('tbStatus', data)
+ tagType=commonFuc().analysis_json('tagType', data)
+ goodsDi=commonFuc().analysis_json('goodsDi', data)
+ distrBillId=commonFuc().analysis_json('distrBillId', commonFuc().analysis_json('ext', data))
+ purBillId=commonFuc().analysis_json('purBillId', commonFuc().analysis_json('ext', data))
+ distrDetailId=commonFuc().analysis_json('distrDetailId', commonFuc().analysis_json('ext', data))
+ print(UT_id)
+ # ========================扫码复核
+ # ========出库复核提交==========
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_stock_review_pass_submit_url")
+
+ print('url', url)
+ # sourceId = ' '.join(PICK_ID)
+ sourceId=PICK_ID
+ # 请求体
+ request_body = commonFuc().get_business_data(module, "payload21", UT_id, createTime, snCode, hosId, stockId,
areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, distrDetailId,
distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
- pkgDefName, printNum, made,
- hosGoodsCode, PICK_ID,areaName,stockName)
- print('request_body', '拣货扫码', request_body)
+ pkgDefName, made, hosGoodsCode, sourceId)
+ print('request_body', request_body)
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('herpService_stock_review_pass_submit_urlresult', result)
+ # ========出库复核提交
+
+def second_dept_one_key_in():
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
+ 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等信息，使用创建的用户登录============结束
+ # 科室入库,列表查询=========
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "dept_stock_in_page_url")
+ print('科室入库,列表查询url', 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, "payload28", get_branch_id(), get_hosid())
+ print('request_body', '科室入库,列表查询ur', request_body)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
- PICK_ID = commonFuc().analysis_json('data', result)
+ deptid = commonFuc().analysis_json('deptId',
+ commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+ sourceId = commonFuc().analysis_json('sourceId',
+ commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+ sourceType = commonFuc().analysis_json('sourceType',
+ commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+ billMode = commonFuc().analysis_json('billMode',
+ commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+ deptName = commonFuc().analysis_json('deptName',
+ commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
-def get_branch_name():
- return FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_name"]
\ No newline at end of file
+ # 科室入库,列表查询==========================================================
+ # 科室入库页面获取库区信息=================================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "dept_stockUser_queryStockShelfList_url")
+ print('科室入库页面获取库区信息,url', url)
+ request_body = commonFuc().get_business_data(module, "payload29", deptid, uxid)
+ print('request_body', '科室入库页面获取库区信息', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('科室入库页面获取库区信息result', result)
+ data = commonFuc().analysis_json('data', result)
+ areaCode = commonFuc().analysis_json('areaCode', data)
+ areaName = commonFuc().analysis_json('areaName', data)
+ # 科室入库页面获取库区信息=================================================
+
+ # 科室入库页面获取单据详细信息=================================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "dept_stock_in_detail_url")
+ print('科室入库页面获取单据详细信息,url', url)
+ targetAreaCode = areaCode
+ request_body = commonFuc().get_business_data(module, "payload30", deptid, targetAreaCode, get_hosid(), sourceId,
+ sourceType, billMode)
+ print('request_body', '科室入库页面获取单据详细信息', request_body)
+
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ data = commonFuc().analysis_json('data', result)
+ viewId = commonFuc().analysis_json('viewId', data)
+ shelfCode = commonFuc().analysis_json('shelfCode', data)
+ # 科室入库页面获取单据详细信息====================================================
+ # 一键入库====================================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "dept_stock_in_submit_url")
+ print('一键入库,url', url)
+ targetAreaCode = areaCode
+ targetAreaName = areaName
+ request_body = commonFuc().get_business_data(module, "payload31", viewId, shelfCode, sourceId,
+ sourceType, deptid, deptName, targetAreaCode, targetAreaName)
+ print('request_body', '一键入库', request_body)
+
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('一键入库result', result)
+ # 一键入库====================================================
\ No newline at end of file
diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message
index 1e7ed236de2cd0e786dd7a6d7617c0b8d59adb37..21e24d22a28ea4beaf5a42959f0fdf2d793dc844 100644
--- a/data/a2_mdm3_ea/message
+++ b/data/a2_mdm3_ea/message
@@ -1,3 +1,3 @@
企业信息:
- e_id: CR202405170114
- cname: 国药集团公司9E$q)
+ e_id: CR202405200038
+ cname: 国药集团公司qgVTA
diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message
index 0c2c27884c4e377a140074b38fbf137745d34062..7c87f24012db55d56b5a048b5fe2eb43f95d20cb 100644
--- a/data/a3_mdm3_hs/message
+++ b/data/a3_mdm3_hs/message
@@ -1,3 +1,3 @@
医院信息:
- h_id: 湖南省人民医院)XSGh
- h_name: 湖南省人民医院)XSGh
+ h_id: 湖南省人民医院oC1eg
+ h_name: 湖南省人民医院oC1eg
diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2
index c8c8eda0083f336bc41327711ffe914594c7e2bd..a36848edb420cf75639e8567c6420142656c75da 100644
--- a/data/a5_mdm3_pdm/message2
+++ b/data/a5_mdm3_pdm/message2
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2405170026_1
+ MSPid: MSP2405200011_1
hosId: h0347
- hosGoodsId: h034700003634
- provGoodsid: provGood-99220767
- goodsAuditBillId: MSP2405170026
- targetId: MSP2405170026_1
+ hosGoodsId: h034700003667
+ provGoodsid: provGood-99220800
+ goodsAuditBillId: MSP2405200011
+ targetId: MSP2405200011_1
diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message
index c971ee43bbb7ea41d4ec198b6e3a9bf88a95e9d8..6376fa801ed0500a52b292d15850d7261e92b28f 100644
--- a/data/b2_herp3_bs/message
+++ b/data/b2_herp3_bs/message
@@ -1,6 +1,6 @@
院区新增:
- branch_id: h0347-3605
- branch_name: 东土城路院区VeCS2
+ branch_id: h0347-3611
+ branch_name: 东土城路院区!6enX
科室信息:
- dept2_id: ec3e173b8bb14fd1b178185faf081198
+ dept2_id: 745b792a76cd4a708842eef63ae5b991
dept2_name: 二级检验科002
diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data
index cc98f26d676f9d2cf5c577257d956999ad63e8f3..74759d8e4d7b72e59e54899dfd9373dfba401b3f 100644
--- a/data/b5_spd3_core_business_flow/data
+++ b/data/b5_spd3_core_business_flow/data
@@ -52,8 +52,7 @@
"herpService_BuyPick_pickScan_url": "/api/herpService/BuyPick/pickScan"
"herpService_hdiBarcode_scan_url": "/api/herpService/stock/hdiBarcode/scan/"
"mcmsInvoice_getById_url": "/api/herpService/mcmsInvoice/getById/"
-
-
+"herpService_BuyPick_updateStatus_url": "/api/herpService/BuyPick/updateStatus?pickId="
"username": "xhs1009"
"password": "1qaz!QAZ"
@@ -88,6 +87,7 @@ json_headers2: {
"payload15": {"pageNum":1,"pageSize":50,"queryObject":{"invoiceNumber":"","invoiceDate1":"","invoiceDate2":"","checkDate1":"","checkDate2":"","tbStatus":"30","hosId":"%s"},"hosId":"%s"}
"payload16": {"invoiceBillIdList":["%s"],"payChannelEnum":"YGPT","hosId":"%s"}
"payload17": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["","","","","",""],"goodsName":"%s","branchId":"%s","purModes":[],"ssccCode":"","deptId":"","deptQuery":false,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":""}}
+"payload17_1": {"pageNum":1,"pageSize":50,"queryObject":{"goodsName":"%s","branchId":"%s","purModes":[""],"ssccCode":"","deptId":"","deptQuery":false,"stockId":"","bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}}
"payload18": {"areaCode":"%s","code":"%s","pickType":"TH","stockId":"%s"}
"payload19": {"areaCode":"%s","reasonKind":"1","remark":"","barCodeList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":"%s","deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"subSendFlag":"%s","onlyKey":"%s2fa9d44bf3b443f184ea457066259ee13332024-11-02100p1e171p1e171"}],"areaName":"%s","hosId":"%s","branchId":"%s","deptId":"%s","deptName":"%s","stockId":"%s","pickType":"TH"}
@@ -122,4 +122,7 @@ json_headers2: {
"payload47": {"generateAll":false,"ids":["%s"]}
"payload48": {"pageNum":1,"pageSize":50,"queryObject":{"pickType":"KS","id":"","pickerName":"","targetDeptName":"","priorityList":[],"areaCode":"","keyword":"%s","goodsSpec":""}}
"payload49": {"lockStatus":1,"pickId":"%s","version":"%s"}
-"payload50": {"areaCode":"%s","hdiList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":"%s","deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"id":"%s","areaName":"%s","stockName":"%s中心库房"}
\ No newline at end of file
+"payload50": {"areaCode":"%s","hdiList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":"%s","deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"id":"%s","areaName":"%s","stockName":"%s中心库房"}
+"payload51": "%s"
+"payload52": {"batchList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"sourceId":"%s","sourceType":"KS","sourceVersion":"3","remark":"","reviewAll":0}
+"payload50_2": {"areaCode":"%s","hdiList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","multiChargeFlag":0,"useFrequency":1},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":null,"pkgDefQty":null,"purDetailId":null,"pkgDefName":null,"printNum":"%s","deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"id":"%s","areaName":"%s","stockName":"%s"}
diff --git a/report/summary.html b/report/summary.html
index 1d2e4c35f4c8ea513091509c7810166844286479..1b08689b35c88dfbfd5a1106d05e5a980034a083 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -56,7 +56,7 @@
| 1 |
1 |
- 1分47秒 |
+ 0分53秒 |
100.0% |
@@ -72,9 +72,9 @@
- | a_a9流程六_中心库入库结算_负结算 |
+ a_a8流程五_中心库入库结算_正结算3_外网开票 |
成功 |
- 107.458 |
+ 52.962 |
xiaohesheng |