Skip to content
GitLab
Commit 794eccc0 authored by 肖 和生's avatar 肖 和生
Browse files

Merge remote-tracking branch 'remotes/origin/master' into core_flow

parents cdb004ad 5f590d7a
Hide whitespace changes
Inline Side-by-side
air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air/a_b5流程十二请领业务流_二级库向二级库.py
View file @ 794eccc0
...@@ -72,7 +72,7 @@ def second_dept_Request(hosGoodsId, type): ...@@ -72,7 +72,7 @@ def second_dept_Request(hosGoodsId, type):
# hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'] # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '') GoodsId = hosGoodsId.replace(get_hosid(), '')
# areaCode = get_stockAreaId_new(deptid2, deptname2, 2) # areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='二级科室005'and shelf_name='默认库区'order by create_time desc LIMIT 1;")) areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='二级科室005'and shelf_name='默认库区' and create_user='%s' LIMIT 1;" % uxid))
request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode) request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode)
print('我要请领_手工请领_列表查询', 'request_body', request_body) print('我要请领_手工请领_列表查询', 'request_body', request_body)
result = commonFuc().http_post(url, request_body, headers) result = commonFuc().http_post(url, request_body, headers)
......
common/db/sql/sql_del_branch_info.py
View file @ 794eccc0
...@@ -313,10 +313,13 @@ class delData(object): ...@@ -313,10 +313,13 @@ class delData(object):
hosGoodsId1 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'] hosGoodsId1 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
hosGoodsId2 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] hosGoodsId2 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
hosGoodsId3 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'] hosGoodsId3 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
#
info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
username = info['username1']
# 条码 # 条码
sql1 = "delete from mcms_pkg where branch_id='%s';" % branch_id sql1 = "delete from mcms_pkg where branch_id='%s';" % branch_id
sql2 = "delete from mcms_pkg_batch where hos_goods_id in('%s','%s','%s');" % ( sql2 = "delete from mcms_pkg_batch where hos_goods_id in('%s','%s','%s') and create_user !=(select id from sys_user where user_code='%s');" % (
hosGoodsId1, hosGoodsId2, hosGoodsId3) hosGoodsId1, hosGoodsId2, hosGoodsId3,username)
sql3 = "delete from hdi_barcode where branch_id='%s';" % branch_id sql3 = "delete from hdi_barcode where branch_id='%s';" % branch_id
# sql4 = "delete from cabinet_epc_info where branch_id=%s" % branch_id # sql4 = "delete from cabinet_epc_info where branch_id=%s" % branch_id
cursor.execute(sql1) cursor.execute(sql1)
......
report/summary.html
View file @ 794eccc0
...@@ -75,10 +75,10 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 ...@@ -75,10 +75,10 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
</tr> </tr>
<tr width="600"> <tr width="600">
<td class='details-col-elapsed'>16</td> <td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>10</td> <td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>0分39秒</td> <td class='details-col-elapsed'>0分8秒</td>
<td class="details-col-elapsed">62.5%</td> <td class="details-col-elapsed">100.0%</td>
</tr> </tr>
</table> </table>
...@@ -93,114 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 ...@@ -93,114 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
</tr> </tr>
<tr width="600"> <tr width="600">
<td class="details-col-elapsed"><a href='../log/a1_1产品新增导入_高值/log.html' target='_blank'>a1_1产品新增导入_高值</a></td> <td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td>
<td class="success">成功</td> <td class="success">成功</td>
<td class="details-col-elapsed">3.909</td> <td class="details-col-elapsed">8.307</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a1_2产品新增导入_试剂/log.html' target='_blank'>a1_2产品新增导入_试剂</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">2.287</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a1产品新增导入/log.html' target='_blank'>a1产品新增导入</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">2.403</td>
<td class="details-col-elapsed">xiaohesheng</td>
</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.37</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a3产品信息审核_查询/log.html' target='_blank'>a3产品信息审核_查询</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">1.985</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a4产品信息审核通过/log.html' target='_blank'>a4产品信息审核通过</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">1.984</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a4产品信息审核驳回/log.html' target='_blank'>a4产品信息审核驳回</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">5.994</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a5产品信息审核查询_无数据/log.html' target='_blank'>a5产品信息审核查询_无数据</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">2.094</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a6产品信息审核_获取产品详情信息/log.html' target='_blank'>a6产品信息审核_获取产品详情信息</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">1.973</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a7产品信息审核_查询/log.html' target='_blank'>a7产品信息审核_查询</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">6.981</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a7产品信息审核批量_通过/log.html' target='_blank'>a7产品信息审核批量_通过</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">1.912</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a8产品信息审核批量_驳回/log.html' target='_blank'>a8产品信息审核批量_驳回</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">4.467</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a8产品新增和审核通过/log.html' target='_blank'>a8产品新增和审核通过</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">1.912</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a8产品新增和审核驳回/log.html' target='_blank'>a8产品新增和审核驳回</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">0.048</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a99产品信息审核_锁定/log.html' target='_blank'>a99产品信息审核_锁定</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">0.004</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/a99产品信息审核_锁定后查询/log.html' target='_blank'>a99产品信息审核_锁定后查询</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">0.002</td>
<td class="details-col-elapsed">xiaohesheng</td> <td class="details-col-elapsed">xiaohesheng</td>
</tr> </tr>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment