diff --git "a/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\272\214\347\272\247\345\272\223.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\272\214\347\272\247\345\272\223.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\272\214\347\272\247\345\272\223.py"
new file mode 100644
index 0000000000000000000000000000000000000000..16762619cc15b9fe960910fbe08cd68f7bb2fb63
--- /dev/null
+++ "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\272\214\347\272\247\345\272\223.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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\272\214\347\272\247\345\272\223.py"
@@ -0,0 +1,320 @@
+# -*- encoding=utf8 -*-
+import json
+import traceback
+
+from air_case.b1_herp3_login.鐧诲綍鍐呯綉绯荤粺.鐧诲綍鍐呯綉绯荤粺 import login_system
+from air_case.public1.public1.public1 import *
+from common.db.sql.sql_del_branch_info import delData
+
+from common.fileUtls import FileUtils
+from common.run_cmd_script import execute_command
+from common.timeUtils import timeUtils
+from airtest.core.api import using
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,spd_core1,a_b4娴佺▼鍗佷竴璇烽涓氬姟娴乢浜岀骇搴撳悜浜岀骇搴�,id2302,id2302-14,sit,on
+鏍稿績涓氬姟娴�:a_b4娴佺▼鍗佷竴璇烽涓氬姟娴乢浜岀骇搴撳悜浜岀骇搴�
+python runner_test.py tag id2302-14 debug mdm3
+"""
+
+
+def SERACH_goods_id(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鍜宲rojectCode
+ 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"))
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_mcmsBranchGoodsInfo_page_url")
+ dept1 = FileUtils().r_info8("b2_herp3_bs", "鎵€鏈夌瀹d", 'message6')['deptid1']
+ # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "浜у搧瀹℃牳淇℃伅", 'message2')['hosGoodsId']
+ # GoodsId = hosGoodsId.replace(get_hosid(), '')
+ request_body = commonFuc().get_business_data(module, "payload53", GoodsId, get_hosid(), get_branch_id(), dept1)
+ result = commonFuc().http_post(url, request_body, headers)
+ branchGoodsId = commonFuc().analysis_json('id', commonFuc().analysis_json('data', commonFuc().analysis_json('data',
+ result)))
+ return branchGoodsId
+
+
+def goods_move():
+ # # 鐧诲綍鑾峰彇鐢ㄦ埛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鍜宲rojectCode
+ token, projectCode, uxid, corpId, info = login(username, password, 2)
+ # 鐧诲綍鑾峰彇鐢ㄦ埛id绛変俊鎭紝浣跨敤鍒涘缓鐨勭敤鎴风櫥褰�============缁撴潫
+ module = "b2_herp3_bs"
+ # g0_璇烽鍑哄簱娓犻亾璁剧疆_杞Щ浜у搧鍒拌竟浠�
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "updateSettleType_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"))
+ for i in range(1, 4):
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "浜у搧瀹℃牳淇℃伅", 'message%s' % i)
+ hosGoodsId = info['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ branchGoodsId = SERACH_goods_id(GoodsId)
+ # #璇锋眰浣�
+ request_body = commonFuc().get_business_data(module, "payload47", branchGoodsId, hosGoodsId, get_branch_id())
+ print(request_body)
+ # # # 鍙戦€佽姹�
+ result = commonFuc().http_post(url, request_body, headers)
+ print('goods_move,result', result)
+
+
+def second_dept_Request(hosGoodsId, type):
+ 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鍜宲rojectCode
+ 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"))
+
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_queryGoodsInfoPage_url")
+ print('鎴戣璇烽_鎵嬪伐璇烽_鍒楄〃鏌ヨ=================', url)
+ deptid2 = FileUtils().r_info8("b2_herp3_bs", "鎵€鏈夌瀹d", 'message6')['deptid2']
+ deptname2 = FileUtils().r_info8("b2_herp3_bs", "鎵€鏈夌瀹ame", 'message6')['deptid2']
+ # 楂樺€�
+ # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "浜у搧瀹℃牳淇℃伅", 'message1')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
+ request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode)
+ print('鎴戣璇烽_鎵嬪伐璇烽_鍒楄〃鏌ヨ', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('鎴戣璇烽_鎵嬪伐璇烽_鍒楄〃鏌ヨ,result', result)
+ data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+ goodsName = commonFuc().analysis_json('goodsName', data1)
+ goodsSpec = commonFuc().analysis_json('goodsSpec', data1)
+ mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data1)
+ goodsCode = commonFuc().analysis_json('goodsCode', data1)
+ unit = commonFuc().analysis_json('unit', data1)
+ purMode = commonFuc().analysis_json('purMode', data1)
+ goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1)
+ unitName = commonFuc().analysis_json('unitName', data1)
+ price = commonFuc().analysis_json('price', data1)
+ deptId = commonFuc().analysis_json('deptId', data1)
+ # areaCode=commonFuc().analysis_json('areaCode',data1)
+ areaName = '榛樿搴撳尯'
+ targetDeptId = commonFuc().analysis_json('targetDeptId', data1)
+ targetDeptName = commonFuc().analysis_json('targetDeptName', data1)
+ targetStockId = commonFuc().analysis_json('targetStockId', data1)
+ targetStockName = commonFuc().analysis_json('targetStockName', data1)
+ purModeText = commonFuc().analysis_json('purModeText', data1)
+ goodsGeneralName = commonFuc().analysis_json('goodsGeneralName', data1)
+ provName = commonFuc().analysis_json('provName', data1)
+ pkgDefId = commonFuc().analysis_json('pkgDefId', data1)
+ # 淇℃伅鍐欏叆鏂囦欢
+ 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, 'message21')
+ # 鎴戣璇烽_鎵嬪伐璇烽_鍒楄〃鏌ヨ===========================
+ # 娣诲姞鍒拌棰嗚溅=============================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_createBuyCar_url")
+ print('娣诲姞鍒拌棰嗚溅=================', url)
+ if type == 1:
+ request_body = commonFuc().get_business_data(module, "payload40", hosGoodsId, goodsName, goodsSpec,
+ mdmGoodsCode,
+ goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price,
+ deptId,
+ areaCode, areaName, targetDeptId, targetDeptName, targetStockId,
+ targetStockName, purModeText, goodsGeneralName, provName)
+ elif type == 2:
+ request_body = commonFuc().get_business_data(module, "payload41", hosGoodsId, goodsName, goodsSpec,
+ mdmGoodsCode,
+ goodsCode, unit, purMode, goodsMfrsName, unitName, price, deptId,
+ areaCode, areaName, targetDeptId, targetDeptName, targetStockId,
+ targetStockName, purModeText, goodsGeneralName, provName)
+ elif type == 3:
+ request_body = commonFuc().get_business_data(module, "payload42", hosGoodsId, goodsName, goodsSpec,
+ mdmGoodsCode,
+ goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price,
+ deptId,
+ areaCode, areaName, targetDeptId, targetDeptName, targetStockId,
+ targetStockName, purModeText, goodsGeneralName, provName)
+ request_body = get_process_list(request_body)
+ print('娣诲姞鍒拌棰嗚溅', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('娣诲姞鍒拌棰嗚溅,result', result)
+ # 娣诲姞鍒拌棰嗚溅=============================================
+
+
+def BuyCarSubmit():
+ 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鍜宲rojectCode
+ 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"))
+ # 璇烽杞︽煡璇�===============================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_queryBuyCarPage_url")
+ print('璇烽杞︽煡璇�=================', url)
+ deptid2 = FileUtils().r_info8("b2_herp3_bs", "鎵€鏈夌瀹d", 'message6')['deptid2']
+ deptname2 = FileUtils().r_info8("b2_herp3_bs", "鎵€鏈夌瀹ame", 'message6')['deptid2']
+ areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
+ request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2)
+
+ print('璇烽杞︽煡璇�', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('璇烽杞︽煡璇�,result', result)
+ data = commonFuc().analysis_json('data', result)
+ list_id = []
+ for i in data:
+ id = commonFuc().analysis_json('id', i)
+ list_id.append(id)
+ # 璇烽杞︽煡璇�===============================================
+ # 璇烽杞︽彁浜�===============================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_validBuyCarSubmit_url")
+ print('璇烽杞︽彁浜�=================', url)
+
+ billExpdtDate = timeUtils().get_time_add(30, 2)
+ print('billExpdtDate', billExpdtDate)
+ request_body = commonFuc().get_business_data(module, "payload44", billExpdtDate, get_branch_id(), list_id[0],
+ list_id[1], list_id[2])
+
+ print('璇烽杞︽彁浜�', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('璇烽杞︽彁浜�,result', result)
+ # 璇烽杞︽彁浜�===============================================
+ # 鍒涘缓棰嗚溅浜ゆ槗=================================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_createBuyBill_url")
+ print('鍒涘缓棰嗚溅浜ゆ槗=================', url)
+
+ billExpdtDate = timeUtils().get_time_add(30, 2)
+ request_body = commonFuc().get_business_data(module, "payload44", billExpdtDate, get_branch_id(), list_id[0],
+ list_id[1], list_id[2])
+
+ print('鍒涘缓棰嗚溅浜ゆ槗', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('鍒涘缓棰嗚溅浜ゆ槗,result', result)
+ currentTaskList = commonFuc().analysis_json('currentTaskList', commonFuc().analysis_json('data', result))
+
+
+def add_logic_stock():
+ delData().Delete_yb_logic_stock()
+ module = "b5_spd3_core_business_flow"
+ # 鐧诲綍闆嗕腑绠℃帶骞冲彴
+ token, projectCode, uxid, corpId, info = login_platform()
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ commonFuc().get_business_data(module, "X-APP-CODE"))
+ # #娣诲姞浜戜粨===============================================
+ url = commonFuc().get_api_url() + commonFuc().get_business_data(module,
+ "platformService_basic_logic_save_url")
+ print('娣诲姞浜戜粨=================', url)
+
+ request_body = commonFuc().get_business_data(module, "payload54", get_hosid(), get_branch_id(), get_branch_id(),
+ uxid, uxid, get_in_userid(), get_hosid(), uxid, uxid)
+
+ print('娣诲姞浜戜粨', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('娣诲姞浜戜粨,result', result)
+
+
+def cloud_stock_opeartion():
+ print('浜戜粨澶勭悊')
+ # 浜戜粨鐧诲綍
+ token, projectCode, uxid, corpId, info =login_logic_stock()
+ module = "b5_spd3_core_business_flow"
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ commonFuc().get_business_data(module, "X-APP-CODE"))
+ # #浜戜粨澶勭悊鏌ョ湅鍗曟嵁===============================================
+ url = commonFuc().get_api_url() + commonFuc().get_business_data(module,
+ "platformService_basic_logic_save_url")
+ print('浜戜粨澶勭悊鏌ョ湅鍗曟嵁=================', url)
+
+ request_body = commonFuc().get_business_data(module, "payload54", get_hosid(), get_branch_id(), get_branch_id(),
+ uxid, uxid, get_in_userid(), get_hosid(), uxid, uxid)
+
+ print('浜戜粨澶勭悊鏌ョ湅鍗曟嵁', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('浜戜粨澶勭悊鏌ョ湅鍗曟嵁,result', result)
+
+def add_dept2():
+ module='b2_herp3_bs'
+ # 鍐呯綉鐧诲綍
+ username = commonFuc().get_business_data(module, "username")
+ # print('鍖婚櫌鍚嶇О',username)
+ password = commonFuc().get_business_data(module, "password")
+ # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # 鑾峰彇token鍜宲rojectCode
+ token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+ # print( token,projectCode,uxid,corpId,info)
+ # c3_鏂板绉戝_鐗规畩绉戝_浜岀骇搴撴埧
+ branch_id = FileUtils().r_info(module, '闄㈠尯鏂板')["branch_id"]
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "dept_insert_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, "payload15_2", get_branch_id(),get_hosid())
+ print(request_body)
+ # # # 鍙戦€佽姹�
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+
+try:
+ add_dept2()
+ # set_dept_lead() # 璁剧疆浜岀骇绉戝璐熻矗浜�
+ # # 绉戝蹇呴』鍚屾鍒板缃戯紝闆嗕腑绠℃帶骞冲彴鍒涘缓杈逛粨鎵嶈兘閫夋嫨鍒扮敤鎴�,"deptType":"0"
+ # add_logic_stock()
+ #
+ # # 璁剧疆浜у搧鍑哄簱娓犻亾涓鸿竟浠�
+ # goods_move()
+ # updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 璁剧疆鐧诲綍璐﹀彿榛樿鏉冮檺鏄簩绾у簱
+ #
+ # # # # 浣庡€�
+ # 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()
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message
index bffbc196d46fd143d3b52786dcb2ad4532a24d91..6badafc753b130c8df8edb6ab85cbde3c48ea9d0 100644
--- a/data/a2_mdm3_ea/message
+++ b/data/a2_mdm3_ea/message
@@ -1,3 +1,3 @@
浼佷笟淇℃伅:
- e_id: CR202405240038
- cname: 鍥借嵂闆嗗洟鍏徃oJCHn
+ e_id: CR202405270038
+ cname: 鍥借嵂闆嗗洟鍏徃$U^K@
diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message
index 28c518e047bea5b1471eba6e57c8a669e5617885..129d3596fc67d862cba5773d491dc76c2660c0a5 100644
--- a/data/a3_mdm3_hs/message
+++ b/data/a3_mdm3_hs/message
@@ -1,3 +1,3 @@
鍖婚櫌淇℃伅:
- h_id: 婀栧崡鐪佷汉姘戝尰闄�#I4Ev
- h_name: 婀栧崡鐪佷汉姘戝尰闄�#I4Ev
+ h_id: 婀栧崡鐪佷汉姘戝尰闄8UEp
+ h_name: 婀栧崡鐪佷汉姘戝尰闄8UEp
diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2
index b10eaab1f70209bdf3761b1dd0186cac4b86401e..0838d0d4e1805b9b10c61c6b4942a436d3a92efd 100644
--- a/data/a5_mdm3_pdm/message2
+++ b/data/a5_mdm3_pdm/message2
@@ -1,7 +1,7 @@
浜у搧瀹℃牳淇℃伅:
- MSPid: MSP2405240010_1
+ MSPid: MSP2405270011_1
hosId: h0347
- hosGoodsId: h034700003765
- provGoodsid: provGood-99220898
- goodsAuditBillId: MSP2405240010
- targetId: MSP2405240010_1
+ hosGoodsId: h034700003813
+ provGoodsid: provGood-99220946
+ goodsAuditBillId: MSP2405270011
+ targetId: MSP2405270011_1
diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message
index 0d69c16bdca0ddde73e30226726eb016c29a348e..12bd06689326065e3144995ed0bb0e3af5e516ac 100644
--- a/data/a6_mdm3_si/message
+++ b/data/a6_mdm3_si/message
@@ -2,10 +2,10 @@
list_a:
- &id001
settleMonth: '202406'
- pid: OBh0347202405220004
- hosGoodsId: h034700003681
- goodsCode: '00003681'
- goodsName: 涓€娆℃€ф敞灏勫櫒_浣庡€粿s2rQ
+ pid: OBh0347202405270004
+ hosGoodsId: h034700003810
+ goodsCode: '00003810'
+ goodsName: 涓€娆℃€ф敞灏勫櫒_浣庡€糋AP0b
goodsGg: G-31891
mfrsName: 寰峰浗姝屽痉鍏徃 Geuder AG
unit: 鏀�
@@ -16,16 +16,17 @@
cacheleftAmount: 19999.98
purMode: 10
waitInvoicingNum: 0.0
+ invoicingPrice: 99.9999
normalContractId:
normalContract: '1'
detailList:
- - pid: OBh0347202405220004
+ - pid: OBh0347202405270004
settleMonth: '202406'
- hosGoodsId: h034700003681
+ hosGoodsId: h034700003810
batchCode: '333'
- distrDetailId: '03837536'
- distrId: PSh0347202405220005
- distrOrderNo: PSh0347202405220005
+ distrDetailId: '03837740'
+ distrId: PSh0347202405270005
+ distrOrderNo: PSh0347202405270005
settlePrice: 99.9999
maxSettleQty: -100.0
maxSettleAmount: -9999.99
@@ -34,11 +35,11 @@
leftSettleQty: -100.0
leftSettleAmount: -9999.99
hosId: h0347
- provId: p1e223
- branchId: h0347-3616
- balanceDetId: OBh0347202405220004-000001
+ provId: p1e24c
+ branchId: h0347-3635
+ balanceDetId: OBh0347202405270004-000001
purMode: 10
- barCode: 013616000003681010333112405221724112821UT240522000202
+ barCode: 013635000003810010333112405271724120321UT240527000202
batchId:
price:
maxQty:
@@ -50,14 +51,14 @@
oneFcatName:
volumeFlag:
onlineKind:
- viewId: 202406OBh0347202405220004h034700003681
- - pid: OBh0347202405220004
+ viewId: 202406OBh0347202405270004h034700003810
+ - pid: OBh0347202405270004
settleMonth: '202406'
- hosGoodsId: h034700003681
+ hosGoodsId: h034700003810
batchCode: '333'
- distrDetailId: '03837536'
- distrId: PSh0347202405220005
- distrOrderNo: PSh0347202405220005
+ distrDetailId: '03837740'
+ distrId: PSh0347202405270005
+ distrOrderNo: PSh0347202405270005
settlePrice: 99.9999
maxSettleQty: 100.0
maxSettleAmount: 9999.99
@@ -66,11 +67,11 @@
leftSettleQty: 100.0
leftSettleAmount: 9999.99
hosId: h0347
- provId: p1e223
- branchId: h0347-3616
- balanceDetId: OBh0347202405220004-000002
+ provId: p1e24c
+ branchId: h0347-3635
+ balanceDetId: OBh0347202405270004-000002
purMode: 10
- barCode: 013616000003681010333112405221724112821UT240522000254
+ barCode: 013635000003810010333112405271724120321UT240527000233
batchId:
price:
maxQty:
@@ -82,10 +83,10 @@
oneFcatName:
volumeFlag:
onlineKind:
- viewId: 202406OBh0347202405220004h034700003681
- unique: 202406OBh0347202405220004h034700003681
+ viewId: 202406OBh0347202405270004h034700003810
+ unique: 202406OBh0347202405270004h034700003810
onlineKind: '10'
- viewId: 202406OBh0347202405220004h034700003681
+ viewId: 202406OBh0347202405270004h034700003810
list_b:
- *id001
list_c:
diff --git a/data/b2_herp3_bs/data b/data/b2_herp3_bs/data
index 6af859015d74e3a92fb06dd4fa3b12bc5ce94f85..567244eb5ba4a5131a8c2e82187050de34d135ab 100644
--- a/data/b2_herp3_bs/data
+++ b/data/b2_herp3_bs/data
@@ -211,6 +211,8 @@ json_headers2: {
"payload13": {"pageNum": 1,"pageSize": 50,"orderBy": "code asc","queryObject": {"ename": "","branchId": "闄㈠尯id", "branchId": "%s", "hosId": "鍖婚櫌id", "hosId": "h0347" }}
"payload14": {"branchId":"%s","cname":"","ename":"璁惧绉�001","erpCode":"001","address":"璁惧绉�001","contactWay":"13401003250","deptKind":1,"deptCate":1,"deptLevel":"1","flag":"1","hisDeptCodes":"","deptType":"1","packetType":"0","corpId":"h0347","corpKind":1}
"payload15": {"branchId":"%s","cname":"","ename":"浜岀骇妫€楠岀002","erpCode":"002","address":"浜岀骇妫€楠岀002","contactWay":"13401003250","deptKind":7,"deptCate":1,"deptLevel":"2","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1}
+"payload15_2": {"branchId":"%s","cname":"","ename":"浜岀骇妫€楠岀005","erpCode":"005","address":"浜岀骇妫€楠岀005","contactWay":"13401003250","deptKind":7,"deptCate":1,"deptLevel":"2","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"%s","corpKind":1}
+
"payload16": {"branchId":"%s","pid":"%s","cname":"","ename":"涓夌骇妫€娴嬬粍003","erpCode":"003","address":"涓夌骇妫€娴嬬粍003","contactWay":"12401003250","deptKind":7,"deptCate":1,"deptLevel":"3","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1}
"payload17": {"branchId":"%s","pid":"%s","cname":"","ename":"绉戝004","erpCode":"004","address":"涓夌骇绉戝004","contactWay":"涓夌骇绉戝004","deptKind":5,"deptCate":1,"deptLevel":"4","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1}
diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message
index bf7e65e6d93043d632c64d0333bec6b98d0011fe..6066f9663e43e6b42a9914dc09f09516bdfead24 100644
--- a/data/b2_herp3_bs/message
+++ b/data/b2_herp3_bs/message
@@ -1,6 +1,6 @@
闄㈠尯鏂板:
- branch_id: h0347-3627
- branch_name: 涓滃湡鍩庤矾闄㈠尯WDUvl
+ branch_id: h0347-3635
+ branch_name: 涓滃湡鍩庤矾闄㈠尯PMue6
绉戝淇℃伅:
- dept2_id: 1c14108179f54e28bce5b1df6b33fc57
+ dept2_id: ebacb1842d234dfd9dbc59fc11bad8bf
dept2_name: 浜岀骇妫€楠岀002
diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3
index 44ff4b36e819e2a8d4e2794b8c0a6af7fadf4c22..8c00694b2a6e883f3054e38b52de380c9f7faa57 100644
--- a/data/b2_herp3_bs/message3
+++ b/data/b2_herp3_bs/message3
@@ -1,3 +1,3 @@
鐢ㄦ埛鍚嶄俊鎭�:
- username1: 鑷姩鍖栨祴璇�3(GIe
- username2: 鑷姩鍖栨祴璇�3(GIe
+ username1: 鑷姩鍖栨祴璇晆VgNZ
+ username2: 鑷姩鍖栨祴璇晆VgNZ
diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4
index 8ec8e952af1549ac41c0987a974aeac251106036..d669b61b12449114085062fe5cd32a5a45748f08 100644
--- a/data/b2_herp3_bs/message4
+++ b/data/b2_herp3_bs/message4
@@ -1,3 +1,3 @@
涓€绾х瀹や俊鎭�:
- dept1_id: f3f1209531c84bddafbe05bd5d6585f0
+ dept1_id: e621323f605c477493861a11cf8ee8a8
dept1_name: 璁惧绉�001
diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5
index 82f0fb50fd754cf57357d2f78e39bf4c81e2121d..4a4cb83203b740c0d132bfc1b7e10bc15d87140a 100644
--- a/data/b2_herp3_bs/message5
+++ b/data/b2_herp3_bs/message5
@@ -1,3 +1,3 @@
閮ㄩ棬鍜屽簱鍖轰俊鎭�:
- dept1_id: f3f1209531c84bddafbe05bd5d6585f0
- stockAreaId: ee2b9bb497544e5896ee916ba37449fb
+ dept1_id: e621323f605c477493861a11cf8ee8a8
+ stockAreaId: ddf2943da6f64fe9a5461563aed113bc
diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6
index 2290b7d4fc80077c8058d33535ebc1341afafdeb..7cc07f25d2bbc0b3fdcb5fbed9947aecb2909863 100644
--- a/data/b2_herp3_bs/message6
+++ b/data/b2_herp3_bs/message6
@@ -1,8 +1,8 @@
鎵€鏈夌瀹d:
- deptid1: f3f1209531c84bddafbe05bd5d6585f0
- deptid2: 1c14108179f54e28bce5b1df6b33fc57
- deptid3: f972064d25184d298b82978d807c563d
- deptid4: 4226aff73a8d44ab973620a539cc33e9
+ deptid1: e621323f605c477493861a11cf8ee8a8
+ deptid2: ebacb1842d234dfd9dbc59fc11bad8bf
+ deptid3: 97dac712280c45a89bbe2ad3ae40280b
+ deptid4: 05a182bdd747451882d4abec8fc7bc2f
鎵€鏈夌瀹ame:
deptid1: 璁惧绉�001
deptid2: 浜岀骇妫€楠岀002
diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7
index 3651df326317ad0b20c39395ef3c30764f15ff23..4bb46da2b78666651eb7bb86b457bc7cd525e921 100644
--- a/data/b2_herp3_bs/message7
+++ b/data/b2_herp3_bs/message7
@@ -1,4 +1,4 @@
shelfinfo:
- shelfid: ee2b9bb497544e5896ee916ba37449fb
- shelfCode: areah03472053
+ shelfid: ddf2943da6f64fe9a5461563aed113bc
+ shelfCode: areah03472094
areaName: 鑷姩鍖栨祴璇�
diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message
index 89b79b90a2ba6f0a1141d786b1e27f04aa07c2c8..03b0d0f1d7d91d5730b25563e982ad6a60bdb1ce 100644
--- a/data/b5_spd3_core_business_flow/message
+++ b/data/b5_spd3_core_business_flow/message
@@ -1,5 +1,5 @@
渚涜揣鍏崇郴鐢宠2:
- e_corpId: p1e23c
+ e_corpId: p1e24c
h_corpId: h0347
- e_username: 鍥借嵂闆嗗洟鍏徃oJCHn
+ e_username: 鍥借嵂闆嗗洟鍏徃$U^K@
h_name: test001
diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1
index 234a4cf0eaea78443daef552112bc80def199e7c..0aac7ca1c40d7402a38d20814b762cf946d13dbf 100644
--- a/data/b5_spd3_core_business_flow/message1
+++ b/data/b5_spd3_core_business_flow/message1
@@ -1,7 +1,7 @@
浜у搧瀹℃牳淇℃伅:
- MSPid: MSP2405240006_1
+ MSPid: MSP2405270007_1
hosId: h0347
- hosGoodsId: h034700003761
- provGoodsid: provGood-99220894
- goodsAuditBillId: MSP2405240006
- targetId: MSP2405240006_1
+ hosGoodsId: h034700003809
+ provGoodsid: provGood-99220942
+ goodsAuditBillId: MSP2405270007
+ targetId: MSP2405270007_1
diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10
index 6ca4beaef4e51513a69ed171d31aeac6b0f42e61..263e840867af05e49193a4a36441efd1948a99bc 100644
--- a/data/b5_spd3_core_business_flow/message10
+++ b/data/b5_spd3_core_business_flow/message10
@@ -1,9 +1,12 @@
浣庡€奸厤閫佸崟鍙�:
- distrBillId1: PSh0347202405240033
- distrBillId2: PSh0347202405240033
+ distrBillId1: PSh0347202405270011
+ distrBillId2: PSh0347202405270011
楂樺€奸厤閫佸崟鍙�:
- distrBillId1: PSh0347202405240035
- distrBillId2: PSh0347202405240035
+ distrBillId1: PSh0347202405270012
+ distrBillId2: PSh0347202405270012
璇曞墏閰嶉€佸崟鍙�:
- distrBillId1: PSh0347202405240036
- distrBillId2: PSh0347202405240036
+ distrBillId1: PSh0347202405270013
+ distrBillId2: PSh0347202405270013
+楂樺€艰窡鍙伴厤閫佸崟鍙�:
+ distrBillId1: PSh0347202405270014
+ distrBillId2: PSh0347202405270014
diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11
index fd10c3174bd455ff8ab4240b84b01b4902623248..ae4b01a31e1f2e541cac4b294595801fa7885eef 100644
--- a/data/b5_spd3_core_business_flow/message11
+++ b/data/b5_spd3_core_business_flow/message11
@@ -1,3 +1,3 @@
閲囪喘璁″垝鍗曞彿楂樺€�:
- orderNo1: PLAN2024052423841
- orderNo2: PLAN2024052423841
+ orderNo1: PLAN2024052724253
+ orderNo2: PLAN2024052724253
diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12
index 96068853f25f6c04f7bd22e827982cba04599f85..27a1fd8255b8735e072143c3bc25f404223214b2 100644
--- a/data/b5_spd3_core_business_flow/message12
+++ b/data/b5_spd3_core_business_flow/message12
@@ -1,3 +1,3 @@
閲囪喘璁″垝鍗曞彿璇曞墏:
- orderNo1: PLAN2024052423842
- orderNo2: PLAN2024052423842
+ orderNo1: PLAN2024052724254
+ orderNo2: PLAN2024052724254
diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13
index d2610c8c2bc9a561458d34e1baaea862025c027b..5415583db2e3c415fb1e2e99b151e9f7a463a5fe 100644
--- a/data/b5_spd3_core_business_flow/message13
+++ b/data/b5_spd3_core_business_flow/message13
@@ -3,34 +3,33 @@
- &id001
- id:
hosId: h0347
- branchId: h0347-3627
+ branchId: h0347-3635
deptId:
taskType: 1
- sourceOrgId: p1e23c
- sourceOrgName: 鍥借嵂闆嗗洟鍏徃oJCHn
- sourceOrderNo: PSh0347202405240036
- billMode: '66'
+ sourceOrgId: p1e24c
+ sourceOrgName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ sourceOrderNo: PSh0347202405270014
+ billMode: '25'
stockKind:
purMode:
- sourceId: PSh0347202405240036
+ sourceId: PSh0347202405270014
sourceDetailId:
sourceType: PSD
sourceTypeName: 閰嶉€佸崟
sourceVersion: 1
- planOrderNo: PLAN2024052423842
- purOrderNo: CG2024052416651
- recOrgId: f3f1209531c84bddafbe05bd5d6585f0
- recOrgName: 璁惧绉�001
- billRelationJson: '{"planBillId":"Ph034720240524020487","planOrderNo":"PLAN2024052423842","purOrderNo":"CG2024052416651","purBillId":"Ch034720240524000091","purBillDate":"2024-05-24
- 10:37:52","distrBillId":"PSh0347202405240036","distrOrderNo":"PSh0347202405240036"}'
- taskDate: '2024-05-24 10:38:08'
+ planOrderNo: SSSQ202405270276
+ purOrderNo: SSTZ202405270252
+ recOrgId: ebacb1842d234dfd9dbc59fc11bad8bf
+ recOrgName: 浜岀骇妫€楠岀002
+ billRelationJson: '{"operationApplyOrderNo":"SSSQ202405270276","operationNoticeBillId":"Nh034720240527000001","distrBillId":"PSh0347202405270014","operationNoticeOrderNo":"SSTZ202405270252","distrOrderNo":"PSh0347202405270014","operationApplyBillId":"Oh034720240527000001"}'
+ taskDate: '2024-05-27 07:25:51'
taskDateStart:
taskDateEnd:
billModeList:
viewIdList:
supplierFlag: false
tbStatus: 20
- remark: ''
+ remark:
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14
index 4fda07a3ca990e86007f8b89709fee3c68fff12e..8f013c01c68ec921eb0f66e35f3f84b35749abbf 100644
--- a/data/b5_spd3_core_business_flow/message14
+++ b/data/b5_spd3_core_business_flow/message14
@@ -1,13 +1,13 @@
楠屾敹鍗曡鎯呬俊鎭�:
list_a:
- &id001
- - purMode: 60
- unitName: 100鏀�/100
- hosGoodsId: h034700003763
+ - purMode: 20
+ unitName: 1鏀�
+ hosGoodsId: h034700003809
mdmGoodsCode:
- spdGoodsCode: '11660655'
- goodsCode: '00003763'
- goodsName: 鏂板瀷鍐犵姸鐥呮瘨妫€娴嬭瘯鍓侸O67D
+ spdGoodsCode: '11660701'
+ goodsCode: '00003809'
+ goodsName: 楂樺€肩墮閽绘満&K)tl
goodsGg: G-31891
mfrsId:
mfrsName: 寰峰浗姝屽痉鍏徃 Geuder AG
@@ -16,27 +16,27 @@
goodsDi:
miCode:
miDjmc:
- certificateCode: ''
+ certificateCode:
rfidFlag: 0
pkgDefId:
- pkgDefName: '100'
- pkgDefQty: 100.0
- batchCode: '4444'
- expdtDate: '2024-11-30'
- productDate: '2024-05-24'
- provName: 鍥借嵂闆嗗洟鍏徃oJCHn
+ pkgDefName:
+ pkgDefQty: 1.0
+ batchCode: '2222'
+ expdtDate: '2024-12-03'
+ productDate: '2024-05-27'
+ provName: 鍥借嵂闆嗗洟鍏徃$U^K@
provId:
- viewId: '03837648'
+ viewId: '03837749'
verifyFlag: 0
hasSterilize: 0
- id: '03837648'
+ id: '03837749'
detailRelationJson:
- extInfo: '{"goodsGg":"G-31891","goodsCode":"00003763","purMode":60,"goodsName":"鏂板瀷鍐犵姸鐥呮瘨妫€娴嬭瘯鍓侸O67D","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660655","ybDefId":""}'
+ extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
recTemperature: 20
recHumidity: 30
distrPrice: 99.9999
- distrPkgQty: 100.0
- distrQty: 10000.0
+ distrPkgQty: 1.0
+ distrQty: 1.0
price: 99.9999
checkQty: 0.0
checkPkgQty: 0
@@ -44,7 +44,7 @@
initQty:
totalQty:
rowNum:
- settlement: 1
+ settlement: 3
hdiBarcodeList:
detailId:
pkgCode:
@@ -55,7 +55,7 @@
trustMrfsName:
multiChargeFlag: 0
useFrequency: 1
- codingType:
+ codingType: 0
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15
index 4e7f5377d59a4a13e73af36505993520d910bec2..964f73fcb8adf627eceb92c041cb643324e465e2 100644
--- a/data/b5_spd3_core_business_flow/message15
+++ b/data/b5_spd3_core_business_flow/message15
@@ -1,3 +1,3 @@
楠屾敹鍗曞彿:
- CHECK_NO1: CHECKh03472024052400324
- CHECK_NO2: CHECKh03472024052400324
+ CHECK_NO1: CHECKh03472024052700004
+ CHECK_NO2: CHECKh03472024052700004
diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16
index e32f530491c29106d9296753fe6571a053fbcf87..44594e23d968814a4a10fe7fbe7f796d8c934bf1 100644
--- a/data/b5_spd3_core_business_flow/message16
+++ b/data/b5_spd3_core_business_flow/message16
@@ -11,132 +11,28 @@
recType:
stockKind:
purMode:
- sourceId: CHECKh03472024052400322
+ sourceId: CHECKh03472024052700001
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
- deptId: f3f1209531c84bddafbe05bd5d6585f0
+ deptId: e621323f605c477493861a11cf8ee8a8
deptName:
- branchId: h0347-3627
+ branchId: h0347-3635
branchName:
taskType: 1
- sourceOrgId: p1e23c
- sourceOrgName: 鍥借嵂闆嗗洟鍏徃oJCHn
- sourceOrderNo: YS240524322
- taskSourceNo: PSh0347202405240027
- areaCode: areah03472053
+ sourceOrgId: p1e24c
+ sourceOrgName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ sourceOrderNo: YS240527001
+ taskSourceNo: PSh0347202405270005
+ areaCode: areah03472094
areaName: 鑷姩鍖栨祴璇�
goodsName:
goodsGg:
startDate:
endDate:
- taskDate: '2024-05-24 10:33:15'
- pkgTaskId:
- pkgFlag:
- remark: ''
- goodsSpec:
- areaList:
- areaDefaultFlag:
- excludeDeptIds:
- deptIds:
- sourceReplId:
- defaultAreaCode:
- defaultAreaName:
- sourceNo:
- distrOrderNo:
- deptBuyer:
- stockName:
- dataDeptIds:
- oldDeptName:
- oldOrderNo:
- allowRejectFlag:
- targetCodingType: 0
- - id:
- lastModified:
- version:
- createTime:
- createUser:
- lastModifiedUser:
- billMode: '16'
- recType:
- stockKind:
- purMode:
- sourceId: CHECKh03472024052400321
- sourceType: PSD
- sourceVersion: 0
- batchList:
- billRelationJson:
- hosId: h0347
- deptId: f3f1209531c84bddafbe05bd5d6585f0
- deptName:
- branchId: h0347-3627
- branchName:
- taskType: 1
- sourceOrgId: p1e23c
- sourceOrgName: 鍥借嵂闆嗗洟鍏徃oJCHn
- sourceOrderNo: YS240524321
- taskSourceNo: PSh0347202405240023
- areaCode: areah03472053
- areaName: 鑷姩鍖栨祴璇�
- goodsName:
- goodsGg:
- startDate:
- endDate:
- taskDate: '2024-05-24 10:20:24'
- pkgTaskId:
- pkgFlag:
- remark: ''
- goodsSpec:
- areaList:
- areaDefaultFlag:
- excludeDeptIds:
- deptIds:
- sourceReplId:
- defaultAreaCode:
- defaultAreaName:
- sourceNo:
- distrOrderNo:
- deptBuyer:
- stockName:
- dataDeptIds:
- oldDeptName:
- oldOrderNo:
- allowRejectFlag:
- targetCodingType: 0
- - id:
- lastModified:
- version:
- createTime:
- createUser:
- lastModifiedUser:
- billMode: '20'
- recType:
- stockKind:
- purMode:
- sourceId: CHECKh03472024052400273
- sourceType: PSD
- sourceVersion: 0
- batchList:
- billRelationJson:
- hosId: h0347
- deptId: f3f1209531c84bddafbe05bd5d6585f0
- deptName:
- branchId: h0347-3627
- branchName:
- taskType: 1
- sourceOrgId: p1e23c
- sourceOrgName: 鍥借嵂闆嗗洟鍏徃oJCHn
- sourceOrderNo: YS240524273
- taskSourceNo: PSh0347202405240016
- areaCode: areah03472053
- areaName: 鑷姩鍖栨祴璇�
- goodsName:
- goodsGg:
- startDate:
- endDate:
- taskDate: '2024-05-24 10:02:25'
+ taskDate: '2024-05-27 07:12:19'
pkgTaskId:
pkgFlag:
remark: ''
diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17
index 8574c7e99cc76e3f3e62f56da48ccc06aeab5637..9fce559fd4c3799709761d6b5e352700db15e83e 100644
--- a/data/b5_spd3_core_business_flow/message17
+++ b/data/b5_spd3_core_business_flow/message17
@@ -1,7 +1,7 @@
楠屾敹鍗曞簱瀛樿鎯呬俊鎭�:
list_a:
- &id001
- - id: CHECKh034720240524003220001
+ - id: CHECKh034720240527000010001
lastModified:
version:
createTime:
@@ -10,27 +10,27 @@
rowIdx:
purMode: 10
unitName: 100鏀�/100
- pid: CHECKh03472024052400322
- hosGoodsId: h034700003762
+ pid: CHECKh03472024052700001
+ hosGoodsId: h034700003810
batchCode: '333'
- expdtDate: '2024-11-30'
- productDate: '2024-05-24'
+ expdtDate: '2024-12-03'
+ productDate: '2024-05-27'
batchPrice: 99.9999
settlement: 1
batchType: 20
- srcBatchId: '03837639'
+ srcBatchId: '03837740'
srcBatchPrice: 99.9999
- shelfCode: areah03472053-2-01-01
+ shelfCode: areah03472094-2-01-01
shelfKind:
- barcodeId: UT240524000901
+ barcodeId: UT240527000201
subBarcodeId:
qty: 10000.0
pkgQty: 100
- distrId: PSh0347202405240027
- distrDetailId: '03837639'
+ distrId: PSh0347202405270005
+ distrDetailId: '03837740'
pkgDefQty: 100.0
pkgDefName: '100'
- viewId: h0347000037623332024-11-30100鏀�/100
+ viewId: h0347000038103332024-12-03100鏀�/100
codingType:
batchFlag:
hasSterilize: 0
@@ -38,31 +38,31 @@
sterilizePassQty:
sterilizeRejectQty:
orderNo:
- sourceDetailId: '03837639'
- mdmGoodsCode: '11660654'
- goodsCode: '00003762'
+ sourceDetailId: '03837740'
+ mdmGoodsCode: '11660702'
+ goodsCode: '00003810'
tbStatus: 1
billMode: '16'
hosId: h0347
- branchId: h0347-3627
- purBillId: Ch034720240524000065
- provId: p1e23c
- provName: 鍥借嵂闆嗗洟鍏徃oJCHn
+ branchId: h0347-3635
+ purBillId: Ch034720240527000044
+ provId: p1e24c
+ provName: 鍥借嵂闆嗗洟鍏徃$U^K@
subSendFlag: 10
- exeProvId: p1e23c
- exeProvName: 鍥借嵂闆嗗洟鍏徃oJCHn
- purDetailId: 188774e4698143e093c93a44508f4219
- goodsName: 涓€娆℃€ф敞灏勫櫒_浣庡€�(GH)x
+ exeProvId: p1e24c
+ exeProvName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ purDetailId: 2b54c9e07b6542f3a4626424e8bce808
+ goodsName: 涓€娆℃€ф敞灏勫櫒_浣庡€糋AP0b
goodsGg: G-31891
mfrsId: mfrs-11229
mfrsName: 寰峰浗姝屽痉鍏徃 Geuder AG
made: 寰峰浗
unit: 鏀�
purPrice: 99.9999
- pkgDefId: 088c5c85bcce4e13819302c37470253e
- supplyId: cee60bfbae36451baddaeb710869bc05
- subProvId: p1e23c
- subProvName: 鍥借嵂闆嗗洟鍏徃oJCHn
+ pkgDefId: 3357b59177e14c07bcfa632072bc3ce3
+ supplyId: 6ce5e586eb7d45c0ac5b6e82fae84a8f
+ subProvId: p1e24c
+ subProvName: 鍥借嵂闆嗗洟鍏徃$U^K@
subPrice: 99.9999
distrPrice: 99.9999
distrPkgQty: 100.0
@@ -74,13 +74,13 @@
psiPrice: 99.9999
ext:
goodsGg: G-31891
- goodsCode: '00003762'
+ goodsCode: '00003810'
purMode: 10
- goodsName: 涓€娆℃€ф敞灏勫櫒_浣庡€�(GH)x
+ goodsName: 涓€娆℃€ф敞灏勫櫒_浣庡€糋AP0b
ygptCode: ''
transCond: ''
storageCond: ''
- erpCode: '11660654'
+ erpCode: '11660702'
ybDefId: ''
purTaskId:
multiChargeFlag:
diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18
index 47e292e0643580893327794981af14743eadda53..5b3d9688a0c09ac6d4be43f61902927433b1b6f1 100644
--- a/data/b5_spd3_core_business_flow/message18
+++ b/data/b5_spd3_core_business_flow/message18
@@ -1,7 +1,51 @@
鏉＄爜淇℃伅:
list_a:
- -
+ - &id001
+ id: UT240527000701
+ snCode: UT240527000701
+ ssccCode: '010839000181609927'
+ pkgCodeSee: 0136350000038110104444112405271724120321UT240527000701
+ hosGoodsId: h034700003811
+ hosGoodsCode: '00003811'
+ goodsCode: '00003811'
+ goodsName: 鏂板瀷鍐犵姸鐥呮瘨妫€娴嬭瘯鍓�9jSW1
+ goodsSpec: G-31891
+ goodsMfrsName: 寰峰浗姝屽痉鍏徃 Geuder AG
+ unit: 鏀�
+ purMode: 60
+ batchCode: '4444'
+ productDate: '2024-05-27'
+ expdtDate: '2024-12-03'
+ pkgDefName: '100'
+ pkgDefQty: 100.0
+ stockId: 40a8863b26db47cc9e14c01aee2f19c0
+ stockName: 涓滃湡鍩庤矾闄㈠尯PMue6涓績搴撴埧
+ areaName: 鑷姩鍖栨祴璇�
+ areaCode: areah03472094
+ lockStatus: 0
+ unitName: 100鏀�/100
+ shelfCode: areah03472094-2-01-01
+ shelfNo: 鑷姩鍖栨祴璇�-2-01-01
+ pkgDefId: 4777e8610956450fb451f5ced1883bff
+ extInfo: '{"distrDetailId":"03837748","distrBillId":"PSh0347202405270013","certificateCode":"","purBillId":"CG2024052716941","pkgDefQty":100,"pkgDefId":"4777e8610956450fb451f5ced1883bff","pkgDefName":"100"}'
+ bottleId:
+ pkgType: '66'
+ miDjmc: ''
+ miCode: ''
+ transferRatio: 1.0
+ qty: 1
+ shelfKind: 0
+ shelfKindName: 鏅€氳揣浣�
+ provName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ provId: p1e24c
+ inStockDate:
+ mfrCode:
+ made: 寰峰浗
+ price:
+ barName: 100鏀�/100
+ purModeText: 妫€楠岃瘯鍓�
+ codeType: 66
list_b:
- -
+ - *id001
list_c:
- -
+ - *id001
diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19
index 02d3417d8657e7e04aeeb450503003d530d77c02..042796d0022b7c05b0551fb85aa5d74ae915302e 100644
--- a/data/b5_spd3_core_business_flow/message19
+++ b/data/b5_spd3_core_business_flow/message19
@@ -1,12 +1,12 @@
浜у搧淇℃伅:
list_a:
- &id001
- - hosGoodsId: h034700003746
- hosGoodsCode: '00003746'
- provId: p1e236
- subProvId: p1e236
- subProvName: 鍥借嵂闆嗗洟鍏徃p0t4h
- goodsName: 楂樺€肩墮閽绘満FgmfE
+ - hosGoodsId: h034700003809
+ hosGoodsCode: '00003809'
+ provId: p1e24c
+ subProvId: p1e24c
+ subProvName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ goodsName: 楂樺€肩墮閽绘満&K)tl
goodsSpec: G-31891
goodsGeneralName:
goodsMfrsId: mfrs-11229
diff --git a/data/b5_spd3_core_business_flow/message2 b/data/b5_spd3_core_business_flow/message2
index 18b0ba4e1e4f543c33e987168e135bae4c8a1362..ff9f8706c86018efed9e8edf650349677392f6ff 100644
--- a/data/b5_spd3_core_business_flow/message2
+++ b/data/b5_spd3_core_business_flow/message2
@@ -1,7 +1,7 @@
浜у搧瀹℃牳淇℃伅:
- MSPid: MSP2405240007_1
+ MSPid: MSP2405270008_1
hosId: h0347
- hosGoodsId: h034700003762
- provGoodsid: provGood-99220895
- goodsAuditBillId: MSP2405240007
- targetId: MSP2405240007_1
+ hosGoodsId: h034700003810
+ provGoodsid: provGood-99220943
+ goodsAuditBillId: MSP2405270008
+ targetId: MSP2405270008_1
diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20
index 0b59a6feb54bcd23258ed1374193172635710607..1426beec0f676db2d28f28fba60116aa504500fe 100644
--- a/data/b5_spd3_core_business_flow/message20
+++ b/data/b5_spd3_core_business_flow/message20
@@ -1,33 +1,33 @@
浜岀骇搴撴潯鐮佷俊鎭�:
list_a:
- &id001
- id: '8800000001053568'
- snCode: '8800000001053568'
- ssccCode: '010839000180429724'
- pkgCodeSee: '01000000000036801022221124052217241128218800000001053568'
- hosGoodsId: h034700003680
- hosGoodsCode: '00003680'
- goodsCode: '00003680'
- goodsName: 楂樺€肩墮閽绘満(0rN$
+ id: '8800000001057530'
+ snCode: '8800000001057530'
+ ssccCode: '010839000181619926'
+ pkgCodeSee: '01000000000038091022221124052717241203218800000001057530'
+ hosGoodsId: h034700003809
+ hosGoodsCode: '00003809'
+ goodsCode: '00003809'
+ goodsName: 楂樺€肩墮閽绘満&K)tl
goodsSpec: G-31891
goodsMfrsName: 寰峰浗姝屽痉鍏徃 Geuder AG
unit: 鏀�
purMode: 20
batchCode: '2222'
- productDate: '2024-05-22'
- expdtDate: '2024-11-28'
+ productDate: '2024-05-27'
+ expdtDate: '2024-12-03'
pkgDefName:
pkgDefQty: 1.0
- stockId: 11453fa95e8b40e6ad0682ca579cd712
+ stockId: 170bebbeae3240779530ef3f35b69cf7
stockName: 浜岀骇妫€楠岀002搴撴埧
areaName: 榛樿搴撳尯
- areaCode: areah03471984
+ areaCode: areah03472093
lockStatus: 0
unitName: 1鏀�
- shelfCode: areah03471984-A-01-01
+ shelfCode: areah03472093-A-01-01
shelfNo: A01-A-01-01
pkgDefId:
- extInfo: '{"distrDetailId":"03837545","distrBillId":"PSh0347202405220014","pkgDefQty":1,"multiChargeFlag":0,"useFrequency":1}'
+ extInfo: '{"distrDetailId":"03837749","distrBillId":"PSh0347202405270014","pkgDefQty":1,"multiChargeFlag":0,"useFrequency":1}'
bottleId:
pkgType: '25'
miDjmc: ''
@@ -36,9 +36,9 @@
qty: 1
shelfKind: 0
shelfKindName: 鏅€氳揣浣�
- provName: 鍥借嵂闆嗗洟鍏徃f$F5C
- provId: p1e223
- inStockDate: '2024-05-22 07:24:05'
+ provName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ provId: p1e24c
+ inStockDate: '2024-05-27 07:27:05'
mfrCode:
made: 寰峰浗
price:
diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21
index bf0c666f866aecda6b403132115d984ecea5b1c2..e841cdac9bc9b558da44051d43ea7680da4d3934 100644
--- a/data/b5_spd3_core_business_flow/message21
+++ b/data/b5_spd3_core_business_flow/message21
@@ -2,11 +2,11 @@
list_a:
- &id001
- id:
- hosGoodsId: h034700003748
- goodsName: 鏂板瀷鍐犵姸鐥呮瘨妫€娴嬭瘯鍓俻KIh2
+ hosGoodsId: h034700003811
+ goodsName: 鏂板瀷鍐犵姸鐥呮瘨妫€娴嬭瘯鍓�9jSW1
goodsSpec: G-31891
- mdmGoodsCode: '11660640'
- goodsCode: '00003748'
+ mdmGoodsCode: '11660703'
+ goodsCode: '00003811'
unit: 鏀�
purMode: 60
goodsMfrsName: 寰峰浗姝屽痉鍏徃 Geuder AG
@@ -17,28 +17,28 @@
pkgQty:
qty: 0
goodsImg: []
- pkgDefId: 16b05f527c984671a679c6448275aa4a
+ pkgDefId: 4777e8610956450fb451f5ced1883bff
buyPkgQty:
unitName: 100鏀�/100
price: 99.9999
hosId:
branchId:
- deptId: ae5633c54a4741c08e1b76d10025ebf5
+ deptId: ebacb1842d234dfd9dbc59fc11bad8bf
deptName:
areaCode:
areaName:
- targetDeptId: 550f4768e0f74ccbb706d3afa3d63a59
+ targetDeptId: e621323f605c477493861a11cf8ee8a8
targetDeptName: 璁惧绉�001
- targetStockId: e0dc175070b640229a9d913d5161aac0
- targetStockName: 涓滃湡鍩庤矾闄㈠尯CU2K!涓績搴撴埧
+ targetStockId: 40a8863b26db47cc9e14c01aee2f19c0
+ targetStockName: 涓滃湡鍩庤矾闄㈠尯PMue6涓績搴撴埧
purchaseFlag: 1
tempFlag: 0
- grantWay: 2
+ grantWay: 1
deptGoodsStatus:
codingType: 0
purModeText: 妫€楠岃瘯鍓�
goodsGeneralName: 妫€娴嬭瘯鍓�
- provName: 鍥借嵂闆嗗洟鍏徃p0t4h
+ provName: 鍥借嵂闆嗗洟鍏徃$U^K@
noRecPkgQty: 0
noRecQty: 0
list_b:
diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22
index df9f219563ab90461c8f744ff614619d524c2718..b44e012614d4a978057679cf4ff32b11fe6b0fcb 100644
--- a/data/b5_spd3_core_business_flow/message22
+++ b/data/b5_spd3_core_business_flow/message22
@@ -1,14 +1,14 @@
搴撳尯淇℃伅:
list_a:
- &id001
- - id: 2920c945491743478cac349bb5c9124c
- lastModified: '2024-05-23 14:57:15'
- version: 2
- createTime: '2024-05-23 14:45:15'
- createUser: h0347_UID-051284
- lastModifiedUser: h0347_UID-051284
- stockId: ecdd64ecfb2340c897051b3ed314a258
- shelfCode: areah03472028
+ - id: 9cac5fc2be99473fbb9a58e0a91f1e84
+ lastModified: '2024-05-27 07:27:28'
+ version: 1
+ createTime: '2024-05-27 07:04:39'
+ createUser: h0347_UID-051296
+ lastModifiedUser: h0347_UID-051296
+ stockId: 170bebbeae3240779530ef3f35b69cf7
+ shelfCode: areah03472093
shelfName: 榛樿搴撳尯
address: 浜岀骇妫€楠岀002
shelfType:
@@ -18,13 +18,13 @@
parentId:
levelCode:
tbStatus: 1
- linkman: h0347_UID-051284
+ linkman: h0347_UID-051296
recPhone: None
delFlag: 0
shelfNo: A01
shelfKind: 0
hosId:
- deptId: ae5633c54a4741c08e1b76d10025ebf5
+ deptId: ebacb1842d234dfd9dbc59fc11bad8bf
areaCode:
areaName:
stockName:
diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3
index a7e8e7a1ff5319ecb57f0c08b390bd7637fe8af5..878bafa0fe6015db4cf855f9f2754295e7612df0 100644
--- a/data/b5_spd3_core_business_flow/message3
+++ b/data/b5_spd3_core_business_flow/message3
@@ -1,7 +1,7 @@
浜у搧瀹℃牳淇℃伅:
- MSPid: MSP2405240008_1
+ MSPid: MSP2405270009_1
hosId: h0347
- hosGoodsId: h034700003763
- provGoodsid: provGood-99220896
- goodsAuditBillId: MSP2405240008
- targetId: MSP2405240008_1
+ hosGoodsId: h034700003811
+ provGoodsid: provGood-99220944
+ goodsAuditBillId: MSP2405270009
+ targetId: MSP2405270009_1
diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4
index 6bc7e3dac1926372afcfc4acee0d9b599cb07937..2f87c254c04becd94c1430208d8e0f113a3d1561 100644
--- a/data/b5_spd3_core_business_flow/message4
+++ b/data/b5_spd3_core_business_flow/message4
@@ -1,7 +1,7 @@
浜у搧瀹℃牳淇℃伅:
- MSPid: MSP2405240009_1
+ MSPid: MSP2405270010_1
hosId: h0347
- hosGoodsId: h034700003764
- provGoodsid: provGood-99220897
- goodsAuditBillId: MSP2405240009
- targetId: MSP2405240009_1
+ hosGoodsId: h034700003812
+ provGoodsid: provGood-99220945
+ goodsAuditBillId: MSP2405270010
+ targetId: MSP2405270010_1
diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5
index b10eaab1f70209bdf3761b1dd0186cac4b86401e..0838d0d4e1805b9b10c61c6b4942a436d3a92efd 100644
--- a/data/b5_spd3_core_business_flow/message5
+++ b/data/b5_spd3_core_business_flow/message5
@@ -1,7 +1,7 @@
浜у搧瀹℃牳淇℃伅:
- MSPid: MSP2405240010_1
+ MSPid: MSP2405270011_1
hosId: h0347
- hosGoodsId: h034700003765
- provGoodsid: provGood-99220898
- goodsAuditBillId: MSP2405240010
- targetId: MSP2405240010_1
+ hosGoodsId: h034700003813
+ provGoodsid: provGood-99220946
+ goodsAuditBillId: MSP2405270011
+ targetId: MSP2405270011_1
diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6
index 63c27e117618ee5ea1d2a7e02ef611a5d36d22b5..92cd37549327639ffb2e0cf86ffd9450a81dcec1 100644
--- a/data/b5_spd3_core_business_flow/message6
+++ b/data/b5_spd3_core_business_flow/message6
@@ -1,3 +1,3 @@
浜у搧鍖呰淇℃伅:
- unitPackageid1: c45825629a4947f09e489ad172d82c94
- unitPackageid2: c45825629a4947f09e489ad172d82c94
+ unitPackageid1: 4777e8610956450fb451f5ced1883bff
+ unitPackageid2: 4777e8610956450fb451f5ced1883bff
diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7
index 1b5fe062c3971f3131c9a62fd54339c3763ba5cb..10ee478913fecfe9990717e8cd5572637c6f8f17 100644
--- a/data/b5_spd3_core_business_flow/message7
+++ b/data/b5_spd3_core_business_flow/message7
@@ -1,3 +1,3 @@
閲囪喘璁″垝鍗曞彿:
- orderNo1: PLAN2024052423840
- orderNo2: PLAN2024052423840
+ orderNo1: PLAN2024052724252
+ orderNo2: PLAN2024052724252
diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8
index 9fec1f3a593515f9ce95e7dee8d02d2e211e1c63..3589d199302b9c6d901130c32f4635712282c3ad 100644
--- a/data/b5_spd3_core_business_flow/message8
+++ b/data/b5_spd3_core_business_flow/message8
@@ -1,53 +1,38 @@
閰嶉€佽鍗曚俊鎭�:
list_a:
- &id001
- - id: Ch034720240524000091
- lastModified: '2024-05-24 10:37:52'
- version: 0
- createTime: '2024-05-24 10:37:52'
- createUser: h0347_UID-051288
- lastModifiedUser:
- orderNo: CG2024052416651
- billMode: '66'
- recType: YND
+ - id: Nh034720240527000001
+ orderNo: SSTZ202405270252
+ sourceOrderNo: SSSQ202405270276
hosId: h0347
- branchId: h0347-3627
- deptId:
- deptName:
- recOrgId: f3f1209531c84bddafbe05bd5d6585f0
- recOrgName: 璁惧绉�001
- areaCode:
- areaName:
- billExpdtDate:
- sourceId: Ph034720240524020487
- sourceType:
- inSettlement:
- recUser:
- recPhone:
- recAddr: 鑷姩鍖栨祴璇�
- provId: p1e23c
- provName: 鍥借嵂闆嗗洟鍏徃oJCHn
- subSendFlag:
- exeProvId: p1e23c
- exeProvName: 鍥借嵂闆嗗洟鍏徃oJCHn
- billRelationJson:
- extInfo:
- barcodeFlag: 1
- pkgFlag:
- remark: ''
- priority:
- closeStatus: 0
- closeDate:
- upStatus:
- tbStatus: 30
- hosVersion: 3
- billType: CGD
hosName: 閭瑰煄甯備汉姘戝尰闄�(test)
- branchName: 涓滃湡鍩庤矾闄㈠尯WDUvl
- sumQty: 10000.0
- sumPkgQty: 100.0
- sumAmount: '999999.0000'
- planOrderNo: PLAN2024052423842
+ branchName: 涓滃湡鍩庤矾闄㈠尯PMue6
+ recDeptName: 浜岀骇妫€楠岀002
+ operName: 琛€绠℃墿寮犳湳
+ operDate: '2024-05-28'
+ operDoctor: 鏉�*
+ patientName: 寮�*
+ status: 10
+ statusText: 寰呯‘璁�
+ version: 0
+ patientInHosId: '123456'
+ surDeptName: ''
+ remark: 鑷姩鍖栨祴璇�
+ createUserName: 鑷姩鍖栨祴璇晆VgNZ
+ distPriority: 0
+ distPriorityText:
+ distId:
+ distNo:
+ hosVersion: 3
+ createTime: '2024-05-27 07:25:40'
+ sumQty:
+ sumAmount:
+ operationPkg: 0
+ provId: p1e24c
+ provName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ subProvId: ''
+ subProvName: ''
+ recDeptId: ebacb1842d234dfd9dbc59fc11bad8bf
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9
index 014b87346ec924ffcd78f8b9de262a4f1c4f6c2e..597351f4ce77b8c15570a1e7ec67f49facc51b0c 100644
--- a/data/b5_spd3_core_business_flow/message9
+++ b/data/b5_spd3_core_business_flow/message9
@@ -1,87 +1,70 @@
閰嶉€佽鍗曡缁嗕俊鎭�:
list_a:
- &id001
- - id: eb232b6179aa4d679172d5082d1f6dee
- lastModified:
- version:
- createTime:
- createUser:
- lastModifiedUser:
- pid: Ch034720240524000091
- orderNo: CG2024052416651
- sourceId: b905a7b30fae47a18a54d8be4ae2c54b
- hosGoodsId: h034700003763
- mdmGoodsCode: '11660655'
- goodsCode: '00003763'
- purMode: 60
+ id: Nh034720240527000001
+ orderNo: SSTZ202405270252
+ sourceOrderNo: SSSQ202405270276
+ hosId: h0347
+ hosName: 閭瑰煄甯備汉姘戝尰闄�(test)
+ branchName: 涓滃湡鍩庤矾闄㈠尯PMue6
+ recDeptName: 浜岀骇妫€楠岀002
+ operName: 琛€绠℃墿寮犳湳
+ operDate: '2024-05-28'
+ operDoctor: 鏉�*
+ patientName: 寮�*
+ status: 20
+ statusText: 寰呴厤閫�
+ version: 1
+ patientInHosId: '123456'
+ surDeptName: ''
+ remark: 鑷姩鍖栨祴璇�
+ createUserName: 鑷姩鍖栨祴璇晆VgNZ
+ distPriority: 0
+ distPriorityText: 鍚�
+ distId:
+ distNo:
+ hosVersion: 3
+ createTime: '2024-05-27 07:25:40'
+ sumQty: 1
+ sumAmount: '99.9999'
+ operationPkg: 0
+ provId: p1e24c
+ provName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ subProvId: ''
+ subProvName: ''
+ recDeptId: ebacb1842d234dfd9dbc59fc11bad8bf
+ list_b:
+ - *id001
+ list_c:
+ - *id001
+閰嶉€佽鍗曡缁嗕俊鎭�2:
+ list_a:
+ - &id001
+ - id: h034720240527000001
+ hosGoodsId: h034700003809
+ goodsNum: 1
price: '99.9999'
- supplyId: 65f6a25c1ea64e48966e89c40d1ddec0
- pkgDefId: c45825629a4947f09e489ad172d82c94
- pkgDefName: '100'
- pkgDefQty: 100.0
- pkgQty: 100.0
- qty: 10000.0
- conPkgQty: 100.0
- conQty: 10000.0
- checkPkgQty: 0.0
- checkQty: 0.0
- distrPkgQty: 0.0
- distrQty: 0.0
- notSendQty: 0.0
- notSendPkgQty: 0.0
- inSettlement: 1
- closeType: 1
- detailRelationJson: '{"planBillId":"Ph034720240524020487","planDetailId":"b905a7b30fae47a18a54d8be4ae2c54b"}'
- extInfo: '{"goodsGg":"G-31891","goodsCode":"00003763","purMode":60,"goodsName":"鏂板瀷鍐犵姸鐥呮瘨妫€娴嬭瘯鍓侸O67D"}'
- remark:
- tbStatus:
- hosVersion:
+ inSettlement: 3
+ inSettlementText: 娑堣€楃粨绠�
+ goodsName: 楂樺€肩墮閽绘満&K)tl
+ goodsSpec: G-31891
+ goodsCode: '00003809'
+ goodsMfrsId: mfrs-11229
+ goodsMfrsName: 寰峰浗姝屽痉鍏徃 Geuder AG
unit: 鏀�
- goodsName: 鏂板瀷鍐犵姸鐥呮瘨妫€娴嬭瘯鍓侸O67D
- mfrsId: mfrs-11229
- mfrsName: 寰峰浗姝屽痉鍏徃 Geuder AG
- goodsGg: G-31891
- mdmGoodsSpecCode: '11660655'
- erpCode: '11660655'
- made: 寰峰浗
- goodsDi:
- miDjmc:
- miGoodsGg:
- miGoodsXh:
- miCode:
- miTwentyCode:
- miTwentysevenCode: ''
- miKindCode:
- purchaseContent:
- purchaseUnit:
- buyContent:
- buyUnit:
- transferRatio:
- extend:
- hitCode: '12'
- hitPrice: 99.9999
- barCodeMng: '2'
- rfidFlag:
- goodsRegCert: ''
- transCond: ''
- storageCond: ''
- diType: gs1
- diUse: '36270000037630'
+ subProvId: p1e24c
+ subProvName: 鍥借嵂闆嗗洟鍏徃$U^K@
+ totalAmount: '99.9999'
+ spdGoodsCode: '11660701'
+ barCodeMng: 2
+ erpCode: '11660701'
multiChargeFlag: 0
useFrequency: 1
chargeUnit:
- amount: '999999.0000'
- unitName: 100鏀�/100
- subProvId: p1e23c
- subProvName: 鍥借嵂闆嗗洟鍏徃oJCHn
- subPrice: 99.9999
- replPkgQty: 100.0
- replQty: 10000.0
- ybDefId:
- logicId:
- provGoodsId:
- sendFlag:
- curQry:
+ hitCode: '12'
+ hitPrice: '99.999900'
+ diUse:
+ goodsDi:
list_b:
- *id001
list_c:
diff --git a/report/summary.html b/report/summary.html
index aaf84d684468963c0e2f48112d1babb4265575dd..667802c7c8b467a747ce02d101a0e22fbae6cc78 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 姣忕鏇存柊涓€娆℃椂闂�
<tr width="600">
<td class='details-col-elapsed'>1</td>
- <td class='details-col-elapsed'>1</td>
+ <td class='details-col-elapsed'>0</td>
<td class='details-col-elapsed'>0鍒�2绉�</td>
- <td class="details-col-elapsed">100.0%</td>
+ <td class="details-col-elapsed">0.0%</td>
</tr>
</table>
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 姣忕鏇存柊涓€娆℃椂闂�
</tr>
<tr width="600">
- <td class="details-col-elapsed"><a href='../log/a2_缂栬緫鍖婚櫌淇℃伅/log.html' target='_blank'>a2_缂栬緫鍖婚櫌淇℃伅</a></td>
- <td class="success">鎴愬姛</td>
- <td class="details-col-elapsed">1.895</td>
+ <td class="details-col-elapsed"><a href='../log/a_b4娴佺▼鍗佷竴璇烽涓氬姟娴乢浜岀骇搴撳悜浜岀骇搴�/log.html' target='_blank'>a_b4娴佺▼鍗佷竴璇烽涓氬姟娴乢浜岀骇搴撳悜浜岀骇搴�</a></td>
+ <td class="fail">澶辫触</td>
+ <td class="details-col-elapsed">2.065</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>