• Joined on 2023-10-08
maqiao pushed to XiangTan_MaZuiKe at maqiao/HKC 2024-08-23 09:39:13 +08:00
efd7e78152 抽屉取药中打开抽屉时ColNos为添加数量的库位号
maqiao pushed to XiangTan_MaZuiKe at maqiao/HKC 2024-08-23 08:36:47 +08:00
f144b21a09 添加药盒标签类型,添加打开药盒及无按钮标签
maqiao pushed to XiangTan_Ji at maqiao/HKC 2024-08-21 16:35:36 +08:00
b7a395871d 修改can总线串口号
maqiao pushed to 去掉批次 at maqiao/XiChang 2024-08-20 17:24:15 +08:00
446364f451 还空瓶页面加载数据添加设备id条件
maqiao created branch 去掉批次 in maqiao/XiChang 2024-08-20 14:34:04 +08:00
maqiao pushed to 去掉批次 at maqiao/XiChang 2024-08-20 14:34:04 +08:00
aed46d6c7e 西昌现场要求去掉批次管理
maqiao pushed to XiangXiangJiaoJie at maqiao/HKC 2024-08-20 14:00:33 +08:00
e48cafb748 修改核销处方页面
maqiao pushed to XiangXiangJiaoJie at maqiao/HKC 2024-08-20 13:59:54 +08:00
eb7fc78760 修改核对处方与开抽屉窗口
maqiao pushed to SanYa at maqiao/HuNan_DM 2024-08-20 13:56:55 +08:00
c858bbff7d 修改连接数据库名称
maqiao pushed to secondMaster at maqiao/HuNan_DM 2024-08-20 10:40:43 +08:00
85360a675c Merge branch 'secondMaster' of http://27.128.204.251:9999/maqiao/HuNan_DM into secondMaster
5451dd490a 修改
Compare 2 commits »
maqiao pushed to master at maqiao/XiChang 2024-08-16 17:00:19 +08:00
b39419bf65 修改drug_info表中drug_id为字符型,注释homewindowviewmodel中温度查询定时
maqiao pushed to XiangXiang at maqiao/HKC 2024-08-15 15:36:40 +08:00
7bb4fb8fcc 修改“导出回收销毁记录”为“导出回收取出记录”
maqiao pushed to XiangXiangJiaoJie at maqiao/HKC 2024-08-15 15:26:38 +08:00
bdd640775d 修改核对处方时drawerno。去掉温湿度查询中的dispose
maqiao pushed to XiangXiangJiaoJie at maqiao/HKC 2024-08-15 10:40:12 +08:00
70e15f7b62 登录页去掉抽屉及can串口的提示信息
maqiao pushed to XiangXiang at maqiao/HKC 2024-08-14 09:41:26 +08:00
367923e19f 给交接柜补药时出库记录dm_machine_record表status设为2,等交接柜做处方核销时再修改
maqiao pushed to XiangXiang at maqiao/HKC 2024-08-14 09:13:10 +08:00
c20686d2c3 修改还空瓶
maqiao pushed to XiangXiangJiaoJie at maqiao/HKC 2024-08-13 17:05:33 +08:00
b8249a2788 温湿度添加try catch
maqiao pushed to XiangXiang at maqiao/HKC 2024-08-13 15:50:35 +08:00
427b249429 修改销毁空瓶为取出空瓶
maqiao pushed to XiangXiang at maqiao/HKC 2024-08-12 18:06:49 +08:00
61079319ea 账册查询的account_book_g2表无而查DM5的数据
maqiao pushed to XiangXiangJiaoJie at maqiao/HKC 2024-08-12 17:48:57 +08:00
6cf9e18963 核销处方时保存账册信息为DM3的账册数据